From patchwork Fri Dec 18 02:05:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 558710 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 31F901402E2 for ; Fri, 18 Dec 2015 13:05:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7ED25A75B7; Fri, 18 Dec 2015 03:05:49 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8p443xd4M6Ej; Fri, 18 Dec 2015 03:05:49 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1E93CA75B8; Fri, 18 Dec 2015 03:05:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F3626A759B for ; Fri, 18 Dec 2015 03:05:27 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VVt8GDStz2X2 for ; Fri, 18 Dec 2015 03:05:27 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 IN_IX_MANITU=4.35 (only DNSBL check requested) Received: from conuserg011-v.nifty.com (conuserg011.nifty.com [202.248.44.37]) by theia.denx.de (Postfix) with ESMTPS id 26FDCA758D for ; Fri, 18 Dec 2015 03:05:24 +0100 (CET) Received: from beagle.diag.org (p14090-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.90]) (authenticated) by conuserg011-v.nifty.com with ESMTP id tBI24cbL019247; Fri, 18 Dec 2015 11:04:54 +0900 X-Nifty-SrcIP: [153.142.97.90] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 18 Dec 2015 11:05:08 +0900 Message-Id: <1450404310-20396-10-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450404310-20396-1-git-send-email-yamada.masahiro@socionext.com> References: <1450404310-20396-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini , Joe Hershberger , Jan Kiszka , Ian Campbell , York Sun Subject: [U-Boot] [PATCH 09/11] ARM: bootm: BOOTM_ENABLE_MEMORY_TAG X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Do not use a macro that just ends up in unreadable code. Signed-off-by: Masahiro Yamada --- 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 c83fb87..576b6f1 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_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 diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 2818aee..da6434e 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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) {