diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2011-04-24 22:22:34 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-04-27 19:38:11 +0200 |
| commit | d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (patch) | |
| tree | a1639101fa12152a79748dc4233631a9d595b954 /arch | |
| parent | aeb630d2063706187352543929058f0308f872d2 (diff) | |
| download | u-boot-midas-d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1.tar.gz u-boot-midas-d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1.tar.bz2 u-boot-midas-d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1.zip | |
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')
| -rw-r--r-- | arch/arm/lib/board.c | 4 | ||||
| -rw-r--r-- | arch/m68k/lib/board.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/lib/board.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index d5b34adfb0..1a784a1e19 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -356,9 +356,13 @@ void board_init_f (ulong bootflag) #endif /* CONFIG_VFD */ #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 */ /* diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index f824b34252..6a892db649 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 */ /* diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 83fb0744f5..aaa5add1fa 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -459,9 +459,13 @@ void 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 */ #if defined(CONFIG_VIDEO) && defined(CONFIG_8xx) |