projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
arch
/
m68k
/
lib
/
board.c
diff --git
a/arch/m68k/lib/board.c
b/arch/m68k/lib/board.c
index
9a51908
..
6a892db
100644
(file)
--- a/
arch/m68k/lib/board.c
+++ b/
arch/m68k/lib/board.c
@@
-76,7
+76,7
@@
static char *failed = "*** failed ***\n";
#include <environment.h>
extern ulong __init_end;
#include <environment.h>
extern ulong __init_end;
-extern ulong _
end
;
+extern ulong _
_bss_end__
;
extern void timer_init(void);
extern void timer_init(void);
@@
-252,7
+252,7
@@
board_init_f (ulong bootflag)
* - monitor code
* - board info struct
*/
* - monitor code
* - board info struct
*/
- len = (ulong)&_
end
- CONFIG_SYS_MONITOR_BASE;
+ len = (ulong)&_
_bss_end__
- CONFIG_SYS_MONITOR_BASE;
addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size;
addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size;
@@
-277,9
+277,13
@@
board_init_f (ulong bootflag)
debug ("Top of RAM usable for U-Boot at: %08lx\n", addr);
#ifdef CONFIG_LCD
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;
/* reserve memory for LCD display (always full pages) */
addr = lcd_setmem (addr);
gd->fb_base = addr;
+#endif /* CONFIG_FB_ADDR */
#endif /* CONFIG_LCD */
/*
#endif /* CONFIG_LCD */
/*
@@
-460,7
+464,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
malloc_bin_reloc ();
#if !defined(CONFIG_SYS_NO_FLASH)
malloc_bin_reloc ();
#if !defined(CONFIG_SYS_NO_FLASH)
- puts ("F
LASH
: ");
+ puts ("F
lash
: ");
if ((flash_size = flash_init ()) > 0) {
# ifdef CONFIG_SYS_FLASH_CHECKSUM
if ((flash_size = flash_init ()) > 0) {
# ifdef CONFIG_SYS_FLASH_CHECKSUM