[U-Boot] [PATCH 07/11] ARM: bootm: BOOTM_ENABLE_CMDLINE_TAG

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


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

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

 arch/arm/include/asm/bootm.h | 6 ------
 arch/arm/lib/bootm.c         | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h
index f16a522..eda8228 100644
--- a/arch/arm/include/asm/bootm.h
+++ b/arch/arm/include/asm/bootm.h
@@ -29,12 +29,6 @@ extern void udc_disconnect(void);
 # define BOOTM_ENABLE_MEMORY_TAGS	0
 #endif
 
-#ifdef CONFIG_CMDLINE_TAG
- #define BOOTM_ENABLE_CMDLINE_TAG	1
-#else
- #define BOOTM_ENABLE_CMDLINE_TAG	0
-#endif
-
 #ifdef CONFIG_INITRD_TAG
  #define BOOTM_ENABLE_INITRD_TAG	1
 #else
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index cba0ceb..d621644 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -218,7 +218,7 @@ static void boot_prep_linux(bootm_headers_t *images)
 		setup_start_tag(gd->bd);
 		if (IS_ENABLED(CONFIG_SERIAL_TAG))
 			setup_serial_tag(&params);
-		if (BOOTM_ENABLE_CMDLINE_TAG)
+		if (IS_ENABLED(CONFIG_CMDLINE_TAG))
 			setup_commandline_tag(gd->bd, commandline);
 		if (BOOTM_ENABLE_REVISION_TAG)
 			setup_revision_tag(&params);
-- 
1.9.1



More information about the U-Boot mailing list