[U-Boot] [PATCH 05/11] image: zap IMAGE_OF_SYSTEM_SETUP

Masahiro Yamada yamada.masahiro at socionext.com
Fri Dec 18 03:05:04 CET 2015


Do not use a macro that just ends up in unreadable code.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 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 465f13f..966dece 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -491,7 +491,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
 			goto err;
 		}
 	}
-	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 0bf79a8..90c06a1 100644
--- a/include/image.h
+++ b/include/image.h
@@ -96,12 +96,6 @@ struct lmb;
 
 #endif /* CONFIG_FIT */
 
-#ifdef CONFIG_OF_SYSTEM_SETUP
-# define IMAGE_OF_SYSTEM_SETUP	1
-#else
-# define IMAGE_OF_SYSTEM_SETUP	0
-#endif
-
 /*
  * Operating System Codes
  */
-- 
1.9.1



More information about the U-Boot mailing list