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

From: Patrice CHOTARD <patrice.chotard@st.com>
To: u-boot@lists.denx.de
Subject: [Uboot-stm32] [PATCH 07/11] board: stm32mp1: use IS_ENABLED to prevent ifdef in board_late_init
Date: Thu, 13 Aug 2020 07:24:08 +0000	[thread overview]
Message-ID: <d0a41bcb-56f1-3636-b3a2-26353e6a0f77@st.com> (raw)
In-Reply-To: <20200731143152.8812-7-patrick.delaunay@st.com>

Hi Patrick

On 7/31/20 4:31 PM, Patrick Delaunay wrote:
> Use IS_ENABLED to prevent ifdef in board_late_init.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
>  board/st/stm32mp1/stm32mp1.c | 60 ++++++++++++++++++------------------
>  1 file changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
> index 985233f2b3..a9705baa24 100644
> --- a/board/st/stm32mp1/stm32mp1.c
> +++ b/board/st/stm32mp1/stm32mp1.c
> @@ -654,47 +654,47 @@ int board_init(void)
>  
>  int board_late_init(void)
>  {
> -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>  	const void *fdt_compat;
>  	int fdt_compat_len;
>  	int ret;
>  	u32 otp;
>  	struct udevice *dev;
>  	char buf[10];
> +	char dtb_name[256];
> +	int buf_len;
> +
> +	if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) {
> +		fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible",
> +					 &fdt_compat_len);
> +		if (fdt_compat && fdt_compat_len) {
> +			if (strncmp(fdt_compat, "st,", 3) != 0) {
> +				env_set("board_name", fdt_compat);
> +			} else {
> +				env_set("board_name", fdt_compat + 3);
>  
> -	fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible",
> -				 &fdt_compat_len);
> -	if (fdt_compat && fdt_compat_len) {
> -		if (strncmp(fdt_compat, "st,", 3) != 0) {
> -			env_set("board_name", fdt_compat);
> -		} else {
> -			char dtb_name[256];
> -			int buf_len = sizeof(dtb_name);
> +				buf_len = sizeof(dtb_name);
> +				strncpy(dtb_name, fdt_compat + 3, buf_len);
> +				buf_len -= strlen(fdt_compat + 3);
> +				strncat(dtb_name, ".dtb", buf_len);
> +				env_set("fdtfile", dtb_name);
> +			}
> +		}
> +		ret = uclass_get_device_by_driver(UCLASS_MISC,
> +						  DM_GET_DRIVER(stm32mp_bsec),
> +						  &dev);
>  
> -			env_set("board_name", fdt_compat + 3);
> +		if (!ret)
> +			ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD),
> +					&otp, sizeof(otp));
> +		if (ret > 0 && otp) {
> +			snprintf(buf, sizeof(buf), "0x%04x", otp >> 16);
> +			env_set("board_id", buf);
>  
> -			strncpy(dtb_name, fdt_compat + 3, buf_len);
> -			buf_len -= strlen(fdt_compat + 3);
> -			strncat(dtb_name, ".dtb", buf_len);
> -			env_set("fdtfile", dtb_name);
> +			snprintf(buf, sizeof(buf), "0x%04x",
> +				 ((otp >> 8) & 0xF) - 1 + 0xA);
> +			env_set("board_rev", buf);
>  		}
>  	}
> -	ret = uclass_get_device_by_driver(UCLASS_MISC,
> -					  DM_GET_DRIVER(stm32mp_bsec),
> -					  &dev);
> -
> -	if (!ret)
> -		ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD),
> -				&otp, sizeof(otp));
> -	if (ret > 0 && otp) {
> -		snprintf(buf, sizeof(buf), "0x%04x", otp >> 16);
> -		env_set("board_id", buf);
> -
> -		snprintf(buf, sizeof(buf), "0x%04x",
> -			 ((otp >> 8) & 0xF) - 1 + 0xA);
> -		env_set("board_rev", buf);
> -	}
> -#endif
>  
>  	/* for DK1/DK2 boards */
>  	board_check_usb_power();

Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

Thanks

Patrice