summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2011-04-24 22:22:34 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-04-27 19:38:11 +0200
commitd32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (patch)
treea1639101fa12152a79748dc4233631a9d595b954 /arch/m68k
parentaeb630d2063706187352543929058f0308f872d2 (diff)
downloadu-boot-imx-d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1.zip
u-boot-imx-d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1.tar.gz
u-boot-imx-d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1.tar.bz2
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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/lib/board.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index f824b34..6a892db 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 */
/*