[Uboot-stm32] [PATCH 09/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in ft_board_setup

[Patrice CHOTARD]

On 8/13/20 9:24 AM, Patrice CHOTARD wrote:
> Hi Patrick
>
> On 7/31/20 4:31 PM, Patrick Delaunay wrote:
>> Use IS_ENABLED to prevent ifdef in ft_board_setup.
>>
>> Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
>> ---
>>
>>  board/st/stm32mp1/stm32mp1.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)


Applied on u-boot-stm/master

Thanks

>> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
>> index 08d18b6da8..4d26738a24 100644
>> --- a/board/st/stm32mp1/stm32mp1.c
>> +++ b/board/st/stm32mp1/stm32mp1.c
>> @@ -842,14 +842,14 @@ int mmc_get_env_dev(void)
>>  #if defined(CONFIG_OF_BOARD_SETUP)
>>  int ft_board_setup(void *blob, struct bd_info *bd)
>>  {
>> -#ifdef CONFIG_FDT_FIXUP_PARTITIONS
>>  	struct node_info nodes[] = {
>>  		{ "st,stm32f469-qspi",		MTD_DEV_TYPE_NOR,  },
>>  		{ "st,stm32f469-qspi",		MTD_DEV_TYPE_SPINAND},
>>  		{ "st,stm32mp15-fmc2",		MTD_DEV_TYPE_NAND, },
>>  	};
>> -	fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
>> -#endif
>> +
>> +	if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS))
>> +		fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
>>  
>>  	return 0;
>>  }
> Reviewed-by: Patrice Chotard <patrice.chotard at st.com>
>
> Thanks
>
> Patrice
> _______________________________________________
> Uboot-stm32 mailing list
> Uboot-stm32 at st-md-mailman.stormreply.com
> https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32