diff options
| author | wdenk <wdenk> | 2004-07-11 18:10:30 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-07-11 18:10:30 +0000 |
| commit | bc54f309a1f274226ed0f938e2a09fc2fd9f9701 (patch) | |
| tree | 036326b6459dc10cf802a8a33049fb4c3b04fee6 /lib_arm | |
| parent | 56523f12830227fc18437bf935fefdb10fe25cca (diff) | |
* Patch by Philippe Robin, 01 Jul 2004:
Add initialization for Integrator and versatile board files.
* Patch by Hinko Kocevar, 01 Jun 2004:
Fix VFD FB allocation, add LCD FB allocation on ARM
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/board.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 7673d063f5c..9cffb4ec24c 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -211,7 +211,7 @@ void start_armboot (void) ulong size; init_fnc_t **init_fnc_ptr; char *s; -#if defined(CONFIG_VFD) +#if defined(CONFIG_VFD) || defined(CONFIG_LCD) unsigned long addr; #endif @@ -243,12 +243,22 @@ void start_armboot (void) /* * reserve memory for VFD display (always full pages) */ - /* armboot_end is defined in the board-specific linker script */ - addr = (_bss_start + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); + /* bss_end is defined in the board-specific linker script */ + addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); size = vfd_setmem (addr); gd->fb_base = addr; #endif /* CONFIG_VFD */ +#ifdef CONFIG_LCD + /* + * reserve memory for LCD display (always full pages) + */ + /* bss_end is defined in the board-specific linker script */ + addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); + size = lcd_setmem (addr); + gd->fb_base = addr; +#endif /* CONFIG_LCD */ + /* armboot_start is defined in the board-specific linker script */ mem_malloc_init (_armboot_start - CFG_MALLOC_LEN); |