From patchwork Tue May 31 13:52:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 98038 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 F0E03B6F7F for ; Tue, 31 May 2011 23:54:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 083B1281BF; Tue, 31 May 2011 15:54:47 +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 nX+h4l+wZL6q; Tue, 31 May 2011 15:54:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A0552281B4; Tue, 31 May 2011 15:54:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9CF5D281B4 for ; Tue, 31 May 2011 15:54:40 +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 8UR-0cReGcm6 for ; Tue, 31 May 2011 15:54:39 +0200 (CEST) X-Greylist: delayed 604 seconds by postgrey-1.27 at theia; Tue, 31 May 2011 15:54:37 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 mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTP id 04404281B2 for ; Tue, 31 May 2011 15:54:37 +0200 (CEST) Received: from epcpsbgm2.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LM20012MBI03S30@mailout4.samsung.com> for u-boot@lists.denx.de; Tue, 31 May 2011 22:44:31 +0900 (KST) X-AuditID: cbfee61b-b7c62ae0000056ed-35-4de4f0bff298 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id 12.41.22253.FB0F4ED4; Tue, 31 May 2011 22:44:31 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LM200A2XBI23U@mmp2.samsung.com> for u-boot@lists.denx.de; Tue, 31 May 2011 22:44:31 +0900 (KST) Date: Tue, 31 May 2011 19:22:25 +0530 From: Thomas Abraham To: u-boot@lists.denx.de Message-id: <1306849945-26418-1-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 X-Brightmail-Tracker: AAAAAA== Cc: k.chander@samsung.com, mk7.kang@samsung.com Subject: [U-Boot] [PATCH] SMDKV310: Fix incorrect conditional compilation for MIU linear mapping 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 Fix the incorrect macro check for MIU linear mapping conditional compilation. Signed-off-by: Thomas Abraham Acked-by: Minkyu Kang --- board/samsung/smdkv310/mem_setup.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/samsung/smdkv310/mem_setup.S b/board/samsung/smdkv310/mem_setup.S index d8c3ed4..73aebe3 100644 --- a/board/samsung/smdkv310/mem_setup.S +++ b/board/samsung/smdkv310/mem_setup.S @@ -123,7 +123,7 @@ mem_ctrl_asm_init: ldr r1, =0x00312640 str r1, [r0, #0x04] @DMC_MEMCONTROL] -#ifdef MIU_LINEAR +#ifdef CONFIG_MIU_LINEAR ldr r1, =0x40e01323 str r1, [r0, #0x08] @DMC_MEMCONFIG0 ldr r1, =0x60e01323 @@ -255,7 +255,7 @@ mem_ctrl_asm_init: ldr r1, =0x00312640 str r1, [r0, #0x04] @DMC_MEMCONTROL] -#ifdef MIU_LINEAR +#ifdef CONFIG_MIU_LINEAR ldr r1, =0x40e01323 str r1, [r0, #0x08] @DMC_MEMCONFIG0 ldr r1, =0x60e01323