diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
| commit | 7511835b29f2074ebfa8ea794f0303ec8e49542b (patch) | |
| tree | 0a0f8539a467c897ea0f33ec0b17b8b664e7c7e3 /lib_arm | |
| parent | 2b68b23373f96199a0cafbfd7a9f79ed62381ebb (diff) | |
| parent | 32482be67775e00b4cbc49fba62347c1ecc6229c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/board.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 964f5cc..f125d38 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -287,9 +287,6 @@ void start_armboot (void) { init_fnc_t **init_fnc_ptr; char *s; -#if !defined(CONFIG_SYS_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD) - ulong size; -#endif #if defined(CONFIG_VFD) || defined(CONFIG_LCD) unsigned long addr; #endif @@ -315,8 +312,7 @@ void start_armboot (void) #ifndef CONFIG_SYS_NO_FLASH /* configure available FLASH banks */ - size = flash_init (); - display_flash_config (size); + display_flash_config (flash_init ()); #endif /* CONFIG_SYS_NO_FLASH */ #ifdef CONFIG_VFD @@ -328,7 +324,7 @@ void start_armboot (void) */ /* bss_end is defined in the board-specific linker script */ addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); - size = vfd_setmem (addr); + vfd_setmem (addr); gd->fb_base = addr; #endif /* CONFIG_VFD */ @@ -343,7 +339,7 @@ void start_armboot (void) */ /* bss_end is defined in the board-specific linker script */ addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); - size = lcd_setmem (addr); + lcd_setmem (addr); gd->fb_base = addr; } #endif /* CONFIG_LCD */ @@ -416,6 +412,11 @@ void start_armboot (void) jumptable_init (); +#if defined(CONFIG_API) + /* Initialize API */ + api_init (); +#endif + console_init_r (); /* fully init console as a device */ #if defined(CONFIG_MISC_INIT_R) |