From patchwork Tue Mar 8 04:50:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minkyu Kang X-Patchwork-Id: 85898 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 E230DB70A7 for ; Tue, 8 Mar 2011 15:50:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 07D822808C; Tue, 8 Mar 2011 05:50:47 +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 1vJlq8geq41z; Tue, 8 Mar 2011 05:50:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C6B3128086; Tue, 8 Mar 2011 05:50:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0D12828086 for ; Tue, 8 Mar 2011 05:50:43 +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 z0PUlwpHxEB6 for ; Tue, 8 Mar 2011 05:50:31 +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 mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id 0AA5528084 for ; Tue, 8 Mar 2011 05:50:29 +0100 (CET) Received: from epmmp2 (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LHQ00AX92S2YCA0@mailout2.samsung.com> for u-boot@lists.denx.de; Tue, 08 Mar 2011 13:50:26 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LHQ00IFJ2S2WL@mmp2.samsung.com> for u-boot@lists.denx.de; Tue, 08 Mar 2011 13:50:26 +0900 (KST) Received: from [165.213.219.113] ([165.213.219.113]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Tue, 08 Mar 2011 13:50:26 +0900 Date: Tue, 08 Mar 2011 13:50:26 +0900 From: Minkyu Kang To: u-boot@lists.denx.de Message-id: <4D75B592.8090901@samsung.com> MIME-version: 1.0 User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ko; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 X-OriginalArrivalTime: 08 Mar 2011 04:50:26.0472 (UTC) FILETIME=[5774DA80:01CBDD4C] Subject: [U-Boot] [PATCH 2/3] m68k: Don't grab memory for LCD if FB address is defined 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 If FB address is defined specific address then don't grab memory for LCD Signed-off-by: Minkyu Kang --- arch/m68k/lib/board.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index 7867ba5..a6cd9b8 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -277,9 +277,13 @@ board_init_f (ulong bootflag) debug ("Top of RAM usable for U-Boot at: %08lx\n", addr); #ifdef CONFIG_LCD +#ifdef CONFIG_FB_ADDR + gd->fb_base = CONFIG_FB_ADDR; +#else /* reserve memory for LCD display (always full pages) */ addr = lcd_setmem (addr); gd->fb_base = addr; +#endif /* CONFIG_FB_ADDR */ #endif /* CONFIG_LCD */ /*