[PATCH v5 14/29] image: Drop IMAGE_OF_SYSTEM_SETUP

[Alex G.]

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 at chromium.org>

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

> ---
> 
> (no changes since v1)
> 
>   common/image-fdt.c | 2 +-
>   include/image.h    | 6 ------
>   2 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/common/image-fdt.c b/common/image-fdt.c
> index cd664649e2c..cf87e455230 100644
> --- a/common/image-fdt.c
> +++ b/common/image-fdt.c
> @@ -597,7 +597,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
>   			}
>   		}
>   	}
> -	if (IMAGE_OF_SYSTEM_SETUP) {
> +	if (IS_ENABLED(CONFIG_OF_SYSTEM_SETUP)) {
>   		fdt_ret = ft_system_setup(blob, gd->bd);
>   		if (fdt_ret) {
>   			printf("ERROR: system-specific fdt fixup failed: %s\n",
> diff --git a/include/image.h b/include/image.h
> index e1e4148e4c8..e190f59232d 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_SYSTEM_SETUP
> -# define IMAGE_OF_SYSTEM_SETUP	1
> -#else
> -# define IMAGE_OF_SYSTEM_SETUP	0
> -#endif
> -
>   extern ulong image_load_addr;		/* Default Load Address */
>   extern ulong image_save_addr;		/* Default Save Address */
>   extern ulong image_save_size;		/* Default Save Size */
>