summaryrefslogtreecommitdiff
path: root/lib_arm
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-07-11 18:10:30 +0000
committerwdenk <wdenk>2004-07-11 18:10:30 +0000
commitbc54f309a1f274226ed0f938e2a09fc2fd9f9701 (patch)
tree036326b6459dc10cf802a8a33049fb4c3b04fee6 /lib_arm
parent56523f12830227fc18437bf935fefdb10fe25cca (diff)
downloadu-boot-imx-bc54f309a1f274226ed0f938e2a09fc2fd9f9701.zip
u-boot-imx-bc54f309a1f274226ed0f938e2a09fc2fd9f9701.tar.gz
u-boot-imx-bc54f309a1f274226ed0f938e2a09fc2fd9f9701.tar.bz2
* 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.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 7673d06..9cffb4e 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);