Do not use a macro that just ends up in unreadable code.
Signed-off-by: Masahiro Yamada yamada.masahiro@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 576b6f1..6cf410c 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -23,12 +23,6 @@ extern void udc_disconnect(void); # define BOOTM_ENABLE_TAGS 0 #endif
-#ifdef CONFIG_INITRD_TAG - #define BOOTM_ENABLE_INITRD_TAG 1 -#else - #define BOOTM_ENABLE_INITRD_TAG 0 -#endif - #ifdef CONFIG_SERIAL_TAG void get_board_serial(struct tag_serialnr *serialnr); #else diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index da6434e..d036d3e 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -224,7 +224,7 @@ static void boot_prep_linux(bootm_headers_t *images) setup_revision_tag(¶ms); if (IS_ENABLED(CONFIG_SETUP_MEMORY_TAGS)) setup_memory_tags(gd->bd); - if (BOOTM_ENABLE_INITRD_TAG) { + if (IS_ENABLED(CONFIG_INITRD_TAG)) { if (images->rd_start && images->rd_end) { setup_initrd_tag(gd->bd, images->rd_start, images->rd_end);