Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / lib_arm / board.c

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 2358beb..f125d38 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -221,6 +221,15 @@ static int init_func_i2c (void)
 }
 #endif
 
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+#include <pci.h>
+static int arm_pci_init(void)
+{
+       pci_init();
+       return 0;
+}
+#endif /* CONFIG_CMD_PCI || CONFIG_PCI */
+
 /*
  * Breathe some life into the board...
  *
@@ -267,6 +276,9 @@ init_fnc_t *init_sequence[] = {
        init_func_i2c,
 #endif
        dram_init,              /* configure available RAM banks */
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+       arm_pci_init,
+#endif
        display_dram_config,
        NULL,
 };
@@ -275,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
@@ -303,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
@@ -316,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 */
 
@@ -331,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 */
@@ -404,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)