From patchwork Wed May 30 17:38:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 162039 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 A2250B706F for ; Thu, 31 May 2012 03:38:42 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 433D028082; Wed, 30 May 2012 19:38:35 +0200 (CEST) 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 6flUaWhFJ+wA; Wed, 30 May 2012 19:38:34 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 46FA028085; Wed, 30 May 2012 19:38:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7FE532807F for ; Wed, 30 May 2012 19:38:22 +0200 (CEST) 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 q1jxG7SjXY2F for ; Wed, 30 May 2012 19:38:22 +0200 (CEST) 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-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 8ECCB28077 for ; Wed, 30 May 2012 19:38:19 +0200 (CEST) Received: by pbcwy7 with SMTP id wy7so240282pbc.3 for ; Wed, 30 May 2012 10:38:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=plvOXKFOlb177Y/qsJhvrzsQce8J9VoSLOaStONrsaI=; b=F19MpQpKKfCfIiOWnNMm5xSKQPb9+C7V5kLgd4NbKIhNutOaMbyDicXIkpXCYSPv/I 5+M2m5wypD5Yh5yOH01a+y5vsojbf30HWY2TKKkJw8MUnfXVXGxWcwcuazj+SZYKGTrc sFoDqDlQM/1sUeJ1QL15lF+7F5wsLN2IS2pXbJwEkA9crpnQfarKNCtCaXuVHHYVgijt 73SYT4HIbXD2Qr1AIWEU4jiA0BsnZEgS6u4q3XXxu9VbBh503Hp54+CmsnvIRj4q1gAV 101HmQufokfH87eTdN7ZHYzC2mPLnhirLvE01kcXokR5ZNIrVqQGD2vp5yBzgsx1QS7W SCtg== Received: by 10.68.232.161 with SMTP id tp1mr7148234pbc.44.1338399498450; Wed, 30 May 2012 10:38:18 -0700 (PDT) Received: from quadra (static-74-41-60-154.dsl1.pco.ca.frontiernet.net. [74.41.60.154]) by mx.google.com with ESMTPS id we10sm1142347pbc.13.2012.05.30.10.38.16 (version=SSLv3 cipher=OTHER); Wed, 30 May 2012 10:38:17 -0700 (PDT) From: Steve Sakoman To: u-boot@lists.denx.de Date: Wed, 30 May 2012 10:38:06 -0700 Message-Id: <1338399488-2095-2-git-send-email-steve@sakoman.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1338399488-2095-1-git-send-email-steve@sakoman.com> References: <1338399488-2095-1-git-send-email-steve@sakoman.com> X-Gm-Message-State: ALoCoQlHF6NeZrWJRbPomsjUlptp7TG4PVTxYqld3WT9jFlwoiUEp8dI3SjPT1hWrNJ7A5fKPBW0 Cc: Steve Sakoman Subject: [U-Boot] [PATCH 1/3] omap: fix compile error in emif-common.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 ext_phy_ctrl_const_base is currently only defined if CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS is set. If not set, the following error occurs: In function `do_sdram_init': | arch/arm/cpu/armv7/omap-common/emif-common.c:985: undefined reference to `ext_phy_ctrl_const_base' Signed-off-by: Steve Sakoman --- arch/arm/cpu/armv7/omap4/sdram_elpida.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/omap4/sdram_elpida.c b/arch/arm/cpu/armv7/omap4/sdram_elpida.c index b538960..0599aaa 100644 --- a/arch/arm/cpu/armv7/omap4/sdram_elpida.c +++ b/arch/arm/cpu/armv7/omap4/sdram_elpida.c @@ -46,6 +46,9 @@ * - emif_get_device_timings() */ +/* Dummy registers for OMAP44xx */ +const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG]; + #ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS static const struct emif_regs emif_regs_elpida_200_mhz_2cs = { @@ -90,9 +93,6 @@ const struct emif_regs emif_regs_elpida_400_mhz_2cs = { .emif_ddr_phy_ctlr_1 = 0x049ff418 }; -/* Dummy registers for OMAP44xx */ -const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG]; - const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2 = { .dmm_lisa_map_0 = 0xFF020100, .dmm_lisa_map_1 = 0,