From d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 Mon Sep 17 00:00:00 2001
From: Minkyu Kang
Date: Sun, 24 Apr 2011 22:22:34 +0000
Subject: Don't grab memory for LCD if FB address is defined

If FB address is defined specific address then don't grab memory for LCD

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Cc: Albert Aribaud <albert.aribaud@free.fr>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Kumar Gala <kumar.gala@freescale.com>
---
 arch/m68k/lib/board.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'arch/m68k')

diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index f824b34252d..6a892db649c 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 */
 
 	/*
-- 
cgit v1.2.3