@@ -23,12 +23,6 @@ extern void udc_disconnect(void);
# define BOOTM_ENABLE_TAGS 0
#endif
-#ifdef CONFIG_SETUP_MEMORY_TAGS
-# define BOOTM_ENABLE_MEMORY_TAGS 1
-#else
-# define BOOTM_ENABLE_MEMORY_TAGS 0
-#endif
-
#ifdef CONFIG_INITRD_TAG
#define BOOTM_ENABLE_INITRD_TAG 1
#else
@@ -222,7 +222,7 @@ static void boot_prep_linux(bootm_headers_t *images)
setup_commandline_tag(gd->bd, commandline);
if (IS_ENABLED(CONFIG_REVISION_TAG))
setup_revision_tag(¶ms);
- if (BOOTM_ENABLE_MEMORY_TAGS)
+ if (IS_ENABLED(CONFIG_SETUP_MEMORY_TAGS))
setup_memory_tags(gd->bd);
if (BOOTM_ENABLE_INITRD_TAG) {
if (images->rd_start && images->rd_end) {
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(-)