From bc54f309a1f274226ed0f938e2a09fc2fd9f9701 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 11 Jul 2004 18:10:30 +0000
Subject: * 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
---
 lib_arm/board.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'lib_arm')

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 7673d063f5..9cffb4ec24 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);
 
-- 
cgit v1.2.1