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 eda8228..c83fb87 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -44,10 +44,8 @@ static inline void get_board_serial(struct tag_serialnr *serialnr) #endif
#ifdef CONFIG_REVISION_TAG - #define BOOTM_ENABLE_REVISION_TAG 1 u32 get_board_rev(void); #else - #define BOOTM_ENABLE_REVISION_TAG 0 static inline u32 get_board_rev(void) { return 0; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index d621644..2818aee 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -220,7 +220,7 @@ static void boot_prep_linux(bootm_headers_t *images) setup_serial_tag(¶ms); if (IS_ENABLED(CONFIG_CMDLINE_TAG)) setup_commandline_tag(gd->bd, commandline); - if (BOOTM_ENABLE_REVISION_TAG) + if (IS_ENABLED(CONFIG_REVISION_TAG)) setup_revision_tag(¶ms); if (BOOTM_ENABLE_MEMORY_TAGS) setup_memory_tags(gd->bd);