[PATCH 33/49] image: Drop IMAGE_OF_BOARD_SETUP

Simon Glass sjg at chromium.org
Tue May 4 01:11:20 CEST 2021


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>
---

(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 d50e1ba3feb..c2d9710bfaa 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -575,7 +575,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");
@@ -622,7 +622,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 122fc25e1b4..deb690d168b 100644
--- a/include/image.h
+++ b/include/image.h
@@ -49,12 +49,6 @@ struct fdt_region;
 
 #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
-- 
2.31.1.527.g47e6f16901-goog



More information about the U-Boot mailing list