Re: [PATCH v5 13/29] image: Drop IMAGE_OF_BOARD_SETUP

Alex G.
2021-10-05T18:57:57Z

On 9/25/21 8:43 PM, Simon Glass wrote:
> This is not needed with Kconfig, since we can use IS_ENABLED() easily
> enough. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

> ---
>
> (no changes since v1)
>
> common/image-fdt.c | 4 ++--
> include/image.h | 6 ------
> 2 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/common/image-fdt.c b/common/image-fdt.c
> index 9441e63a3d4..cd664649e2c 100644
> --- a/common/image-fdt.c
> +++ b/common/image-fdt.c
> @@ -582,7 +582,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
> /* Append PStore configuration */
> fdt_fixup_pstore(blob);
> #endif
> - if (IMAGE_OF_BOARD_SETUP) {
> + if (IS_ENABLED(CONFIG_OF_BOARD_SETUP)) {
> const char *skip_board_fixup;
>
> skip_board_fixup = env_get("skip_board_fixup");
> @@ -629,7 +629,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
> goto err;
>
> #if defined(CONFIG_SOC_KEYSTONE)
> - if (IMAGE_OF_BOARD_SETUP)
> + if (IS_ENABLED(CONFIG_OF_BOARD_SETUP))
> ft_board_setup_ex(blob, gd->bd);
> #endif
>
> diff --git a/include/image.h b/include/image.h
> index 00a80999584..e1e4148e4c8 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -49,12 +49,6 @@ struct fdt_region;
> #include <fdt_support.h>
> #endif /* FIT */
>
> -#ifdef CONFIG_OF_BOARD_SETUP
> -# define IMAGE_OF_BOARD_SETUP 1
> -#else
> -# define IMAGE_OF_BOARD_SETUP 0
> -#endif
> -
> #ifdef CONFIG_OF_SYSTEM_SETUP
> # define IMAGE_OF_SYSTEM_SETUP 1
> #else
>