From patchwork Wed Feb 16 08:54:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Yu Chuang X-Patchwork-Id: 83345 X-Patchwork-Delegate: albert.aribaud@free.fr 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 8C3E4B7113 for ; Wed, 16 Feb 2011 19:55:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65D8F28085; Wed, 16 Feb 2011 09:55:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 Pkp9MKFCdghR; Wed, 16 Feb 2011 09:55:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C798428086; Wed, 16 Feb 2011 09:55:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 168E728086 for ; Wed, 16 Feb 2011 09:55:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 l94czYMrNm5w for ; Wed, 16 Feb 2011 09:55:36 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pw0-f44.google.com (mail-pw0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 1039828085 for ; Wed, 16 Feb 2011 09:55:33 +0100 (CET) Received: by pwi7 with SMTP id 7so228453pwi.3 for ; Wed, 16 Feb 2011 00:55:32 -0800 (PST) Received: by 10.142.226.10 with SMTP id y10mr290144wfg.173.1297846532090; Wed, 16 Feb 2011 00:55:32 -0800 (PST) Received: from localhost.localdomain ([111.82.36.107]) by mx.google.com with ESMTPS id x18sm6922303wfa.11.2011.02.16.00.55.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Feb 2011 00:55:31 -0800 (PST) From: Po-Yu Chuang To: u-boot@lists.denx.de Date: Wed, 16 Feb 2011 16:54:35 +0800 Message-Id: <1297846475-1772-1-git-send-email-ratbert.chuang@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20110216081330.9BE1B1519FE@gemini.denx.de> References: <20110216081330.9BE1B1519FE@gemini.denx.de> Cc: Po-Yu Chuang Subject: [U-Boot] [PATCH v2] arm: get_sp() should always be compiled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Po-Yu Chuang get_sp() was incorrectly excluded if none of CONFIG_SETUP_MEMORY_TAGS CONFIG_CMDLINE_TAG CONFIG_INITRD_TAG CONFIG_SERIAL_TAG CONFIG_REVISION_TAG were defined. Signed-off-by: Po-Yu Chuang --- v2: rebase arch/arm/lib/bootm.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a1649ee..7734953 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -327,12 +327,12 @@ void setup_revision_tag(struct tag **in_params) } #endif /* CONFIG_REVISION_TAG */ - static void setup_end_tag (bd_t *bd) { params->hdr.tag = ATAG_NONE; params->hdr.size = 0; } +#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */ static ulong get_sp(void) { @@ -341,5 +341,3 @@ static ulong get_sp(void) asm("mov %0, sp" : "=r"(ret) : ); return ret; } - -#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */