From patchwork Mon Oct 3 23:59:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Becky Bruce X-Patchwork-Id: 117526 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 A379DB6F64 for ; Tue, 4 Oct 2011 11:15:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 53A7B283BD; Tue, 4 Oct 2011 02:15:24 +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 rpSVb6o94cUP; Tue, 4 Oct 2011 02:15:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4453F283AE; Tue, 4 Oct 2011 02:15:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 29EF6283AE for ; Tue, 4 Oct 2011 02:15:19 +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 XuQxRLERa6IH for ; Tue, 4 Oct 2011 02:15:17 +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 DB3EHSOBE005.bigfish.com (db3ehsobe005.messaging.microsoft.com [213.199.154.143]) by theia.denx.de (Postfix) with ESMTPS id 5B675283A9 for ; Tue, 4 Oct 2011 02:15:16 +0200 (CEST) Received: from mail68-db3-R.bigfish.com (10.3.81.243) by DB3EHSOBE005.bigfish.com (10.3.84.25) with Microsoft SMTP Server id 14.1.225.22; Tue, 4 Oct 2011 00:00:12 +0000 Received: from mail68-db3 (localhost.localdomain [127.0.0.1]) by mail68-db3-R.bigfish.com (Postfix) with ESMTP id 187FDB802B8; Tue, 4 Oct 2011 00:00:12 +0000 (UTC) X-SpamScore: 2 X-BigFish: VS2(zzzz1202h10c0jzz8275dhz2dh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-SS: 0, Received: from mail68-db3 (localhost.localdomain [127.0.0.1]) by mail68-db3 (MessageSwitch) id 13176863599592_27986; Mon, 3 Oct 2011 23:59:19 +0000 (UTC) Received: from DB3EHSMHS009.bigfish.com (unknown [10.3.81.244]) by mail68-db3.bigfish.com (Postfix) with ESMTP id E426B258051; Mon, 3 Oct 2011 23:59:18 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS009.bigfish.com (10.3.87.109) with Microsoft SMTP Server (TLS) id 14.1.225.22; Mon, 3 Oct 2011 23:59:18 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.323.7; Mon, 3 Oct 2011 18:59:08 -0500 Received: from localhost (right.am.freescale.net [10.82.193.13]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p93Nx8Ww007440; Mon, 3 Oct 2011 18:59:08 -0500 (CDT) From: Becky Bruce To: Date: Mon, 3 Oct 2011 18:59:08 -0500 Message-ID: <1317686348215-git-send-email-beckyb@kernel.crashing.org> X-Mailer: git-send-email 1.5.3.rc2.29.gc4640f MIME-Version: 1.0 X-OriginatorOrg: freescale.com Subject: [U-Boot] [PATCH] powerpc/mpc8xxx: Fix ddr build error 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Commit ID 60ce53cf9f40 "GCC4.6: Convert various empty macros to inline functions" changed the "debug" macro to an inline function. This causes the mpc8xxx ddr code to stop building because there is a debug() statement that references symbols that only exist when DEBUG is defined. This patch makes those symbols unconditional. Signed-off-by: Becky Bruce --- arch/powerpc/cpu/mpc8xxx/ddr/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c index 249fd7d..eb70535 100644 --- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c +++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c @@ -132,7 +132,6 @@ void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd, * | interleaving */ -#ifdef DEBUG const char *step_string_tbl[] = { "STEP_GET_SPD", "STEP_COMPUTE_DIMM_PARMS", @@ -153,7 +152,6 @@ const char * step_to_string(unsigned int step) { return step_string_tbl[s]; } -#endif int step_assign_addresses(fsl_ddr_info_t *pinfo, unsigned int dbw_cap_adj[],