* 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
This commit is contained in:
wdenk 2004-07-11 18:10:30 +00:00
parent 56523f1283
commit bc54f309a1
5 changed files with 25 additions and 3 deletions

View File

@ -2,6 +2,12 @@
Changes since U-Boot 1.1.1: 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: * Patch by Martin Krause, 30 Jun 2004:
Add support for TQM5200 board Add support for TQM5200 board

View File

@ -73,6 +73,8 @@ int board_init (void)
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;
gd->flags = 0;
icache_enable (); icache_enable ();
flash__init (); flash__init ();

View File

@ -69,6 +69,8 @@ int board_init (void)
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;
gd->flags = 0;
icache_enable (); icache_enable ();
flash__init (); flash__init ();

View File

@ -79,6 +79,8 @@ int board_init (void)
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;
gd->flags = 0;
icache_enable (); icache_enable ();
flash__init (); flash__init ();

View File

@ -211,7 +211,7 @@ void start_armboot (void)
ulong size; ulong size;
init_fnc_t **init_fnc_ptr; init_fnc_t **init_fnc_ptr;
char *s; char *s;
#if defined(CONFIG_VFD) #if defined(CONFIG_VFD) || defined(CONFIG_LCD)
unsigned long addr; unsigned long addr;
#endif #endif
@ -243,12 +243,22 @@ void start_armboot (void)
/* /*
* reserve memory for VFD display (always full pages) * reserve memory for VFD display (always full pages)
*/ */
/* armboot_end is defined in the board-specific linker script */ /* bss_end is defined in the board-specific linker script */
addr = (_bss_start + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
size = vfd_setmem (addr); size = vfd_setmem (addr);
gd->fb_base = addr; gd->fb_base = addr;
#endif /* CONFIG_VFD */ #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 */ /* armboot_start is defined in the board-specific linker script */
mem_malloc_init (_armboot_start - CFG_MALLOC_LEN); mem_malloc_init (_armboot_start - CFG_MALLOC_LEN);