[PATCH 34/49] image: Drop IMAGE_OF_SYSTEM_SETUP

Simon Glass
2021-05-03T23:11:21Z

This is not needed with Kconfig, since we can use IS_ENABLED() easily
enough. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(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 c2d9710bfaa..80bfa625ab2 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -590,7 +590,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 deb690d168b..eb5ca8a32d3 100644
--- a/include/image.h
+++ b/include/image.h
@@ -49,12 +49,6 @@ struct fdt_region;

#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 */
--
2.31.1.527.g47e6f16901-goog