image: Drop IMAGE_OF_BOARD_SETUP

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>

diff --git a/common/image-fdt.c b/common/image-fdt.c
index b698e961fe795f32ff872f8ab634745f362d165b..2be6d193f42dbdd9cd7f3e007c82cdde116be2a7 100644 (file)
--- 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_ARCH_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 00a80999584554ffca4b492c855d585b7564eb0c..e1e4148e4c8e036cb73dcf5daf33ad70980a260a 100644 (file)
--- 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