diff options
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | board/integratorap/integratorap.c | 2 | ||||
| -rw-r--r-- | board/integratorcp/integratorcp.c | 2 | ||||
| -rw-r--r-- | board/versatile/versatile.c | 2 | ||||
| -rw-r--r-- | lib_arm/board.c | 16 |
5 files changed, 25 insertions, 3 deletions
@@ -2,6 +2,12 @@ Changes since U-Boot 1.1.1: ====================================================================== +* 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 + * Patch by Martin Krause, 30 Jun 2004: Add support for TQM5200 board diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c index 84a4c70..3ab74f0 100644 --- a/board/integratorap/integratorap.c +++ b/board/integratorap/integratorap.c @@ -73,6 +73,8 @@ int board_init (void) /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; + gd->flags = 0; + icache_enable (); flash__init (); diff --git a/board/integratorcp/integratorcp.c b/board/integratorcp/integratorcp.c index 6071d81..8da869c 100644 --- a/board/integratorcp/integratorcp.c +++ b/board/integratorcp/integratorcp.c @@ -69,6 +69,8 @@ int board_init (void) /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; + gd->flags = 0; + icache_enable (); flash__init (); diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c index 626d527..17701dc 100644 --- a/board/versatile/versatile.c +++ b/board/versatile/versatile.c @@ -79,6 +79,8 @@ int board_init (void) /* adress of boot parameters */ gd->bd->bi_boot_params = 0x00000100; + gd->flags = 0; + icache_enable (); flash__init (); 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); |