summaryrefslogtreecommitdiff
path: root/lib_m68k
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-23 14:23:13 +0100
committerWolfgang Denk <wd@denx.de>2008-01-23 14:23:13 +0100
commite57ed96baca1222e6cd3d7032691a89d5890bb4a (patch)
treece82b7473894c8336d786a5779c893e58085f989 /lib_m68k
parent2468592d79891fea4f39d0a414c7316f3af03f4c (diff)
parent57a127201eb3d8cc19170a008e0bd7af608bd72f (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Diffstat (limited to 'lib_m68k')
-rw-r--r--lib_m68k/board.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 43f97c404d..915920641d 100644
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -313,6 +313,16 @@ board_init_f (ulong bootflag)
debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr);
#endif /* CONFIG_PRAM */
+ /* round down to next 4 kB limit */
+ addr &= ~(4096 - 1);
+ debug ("Top of RAM usable for U-Boot at: %08lx\n", addr);
+
+#ifdef CONFIG_LCD
+ /* reserve memory for LCD display (always full pages) */
+ addr = lcd_setmem (addr);
+ gd->fb_base = addr;
+#endif /* CONFIG_LCD */
+
/*
* reserve memory for U-Boot code, data & bss
* round down to next 4 kB limit