diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
| commit | f38536f9138c253b0c1f9c72093a7ec6808e638f (patch) | |
| tree | 43bd82d4f1f96f549821d5fd941dfdc70712b501 /arch/m68k/lib | |
| parent | 34b5fc4d8bba594d53a15be970ca78b03db9d7f5 (diff) | |
| parent | d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (diff) | |
| download | u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.zip u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.gz u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/m68k/lib')
| -rw-r--r-- | 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 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 */ /* |