[U-Boot] [PATCH 03/11] image: zap IMAGE_BOOT_GET_CMDLINE

Masahiro Yamada yamada.masahiro at socionext.com
Fri Dec 18 03:05:02 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.c  | 2 +-
 include/image.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/common/image.c b/common/image.c
index 2c5e0b5..afbc349 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1346,7 +1346,7 @@ int image_setup_linux(bootm_headers_t *images)
 	if (IS_ENABLED(CONFIG_OF_LIBFDT))
 		boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree);
 
-	if (IMAGE_BOOT_GET_CMDLINE) {
+	if (IS_ENABLED(CONFIG_SYS_BOOT_GET_CMDLINE)) {
 		ret = boot_get_cmdline(lmb, &images->cmdline_start,
 				&images->cmdline_end);
 		if (ret) {
diff --git a/include/image.h b/include/image.h
index d19f45c..8da4ef0 100644
--- a/include/image.h
+++ b/include/image.h
@@ -96,12 +96,6 @@ struct lmb;
 
 #endif /* CONFIG_FIT */
 
-#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
-# define IMAGE_BOOT_GET_CMDLINE		1
-#else
-# define IMAGE_BOOT_GET_CMDLINE		0
-#endif
-
 #ifdef CONFIG_OF_BOARD_SETUP
 # define IMAGE_OF_BOARD_SETUP		1
 #else
-- 
1.9.1



More information about the U-Boot mailing list