From patchwork Wed Nov 7 23:47:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 197740 X-Patchwork-Delegate: afleming@freescale.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 A2B4F2C0080 for ; Thu, 8 Nov 2012 10:47:54 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EF9DA4A7BF; Thu, 8 Nov 2012 00:47:52 +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 3cDXs7h3g9Gn; Thu, 8 Nov 2012 00:47:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 927524A7B3; Thu, 8 Nov 2012 00:47:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 42A194A7B3 for ; Thu, 8 Nov 2012 00:47:49 +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 0u4oD9wXMWXL for ; Thu, 8 Nov 2012 00:47:47 +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 ch1outboundpool.messaging.microsoft.com (ch1ehsobe006.messaging.microsoft.com [216.32.181.186]) by theia.denx.de (Postfix) with ESMTPS id 7D7C04A7B2 for ; Thu, 8 Nov 2012 00:47:45 +0100 (CET) Received: from mail195-ch1-R.bigfish.com (10.43.68.235) by CH1EHSOBE006.bigfish.com (10.43.70.56) with Microsoft SMTP Server id 14.1.225.23; Wed, 7 Nov 2012 23:47:44 +0000 Received: from mail195-ch1 (localhost [127.0.0.1]) by mail195-ch1-R.bigfish.com (Postfix) with ESMTP id 4CDCC3E00B7 for ; Wed, 7 Nov 2012 23:47:44 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h1155h) Received: from mail195-ch1 (localhost.localdomain [127.0.0.1]) by mail195-ch1 (MessageSwitch) id 1352332063209995_30102; Wed, 7 Nov 2012 23:47:43 +0000 (UTC) Received: from CH1EHSMHS032.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.251]) by mail195-ch1.bigfish.com (Postfix) with ESMTP id 27D25120143 for ; Wed, 7 Nov 2012 23:47:43 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS032.bigfish.com (10.43.70.32) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 7 Nov 2012 23:47:42 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.318.3; Wed, 7 Nov 2012 23:47:41 +0000 Received: from oslab-l1.am.freescale.net ([10.214.87.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id qA7Nldi2003516; Wed, 7 Nov 2012 16:47:40 -0700 From: York Sun To: Date: Wed, 7 Nov 2012 15:47:39 -0800 Message-ID: <1352332059-29352-1-git-send-email-yorksun@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Subject: [U-Boot] [PATCH] powerpc/mpc8xxx: Fix compiling error caused in DDR driver 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de mpc86xx platforms should use CONFIG_SYS_MPC86xx_DDR2_ADDR in utils.c if applicable. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc8xxx/ddr/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/util.c b/arch/powerpc/cpu/mpc8xxx/ddr/util.c index 940ffff..9a07d9d 100644 --- a/arch/powerpc/cpu/mpc8xxx/ddr/util.c +++ b/arch/powerpc/cpu/mpc8xxx/ddr/util.c @@ -152,7 +152,11 @@ void board_add_ram_info(int use_default) #if CONFIG_NUM_DDR_CONTROLLERS >= 2 if (!(sdram_cfg & SDRAM_CFG_MEM_EN)) { +#ifdef CONFIG_MPC86xx + ddr = (void __iomem *)CONFIG_SYS_MPC86xx_DDR2_ADDR; +#else ddr = (void __iomem *)CONFIG_SYS_MPC85xx_DDR2_ADDR; +#endif sdram_cfg = in_be32(&ddr->sdram_cfg); } #endif