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 | 2 -- arch/arm/lib/bootm.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h index 436c35a..f16a522 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -42,10 +42,8 @@ extern void udc_disconnect(void); #endif
#ifdef CONFIG_SERIAL_TAG - #define BOOTM_ENABLE_SERIAL_TAG 1 void get_board_serial(struct tag_serialnr *serialnr); #else - #define BOOTM_ENABLE_SERIAL_TAG 0 static inline void get_board_serial(struct tag_serialnr *serialnr) { } diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 85adad1..cba0ceb 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -216,7 +216,7 @@ static void boot_prep_linux(bootm_headers_t *images) } else if (BOOTM_ENABLE_TAGS) { debug("using: ATAGS\n"); setup_start_tag(gd->bd); - if (BOOTM_ENABLE_SERIAL_TAG) + if (IS_ENABLED(CONFIG_SERIAL_TAG)) setup_serial_tag(¶ms); if (BOOTM_ENABLE_CMDLINE_TAG) setup_commandline_tag(gd->bd, commandline);