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

[u-boot] / lib_arm / board.c

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 5ade882a97e9d19527e025d846f7f77327c8516d..964f5cc5f2921448b0ed60347f4255c113f4fe8e 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -42,6 +42,7 @@
 #include <command.h>
 #include <malloc.h>
 #include <devices.h>
+#include <timestamp.h>
 #include <version.h>
 #include <net.h>
 #include <serial.h>
@@ -69,7 +70,7 @@ extern void dataflash_print_info(void);
 #endif
 
 const char version_string[] =
-       U_BOOT_VERSION" (" __DATE__ " - " __TIME__ ")"CONFIG_IDENT_STRING;
+       U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"CONFIG_IDENT_STRING;
 
 #ifdef CONFIG_DRIVER_CS8900
 extern void cs8900_get_enetaddr (uchar * addr);
@@ -95,7 +96,7 @@ static
 void mem_malloc_init (ulong dest_addr)
 {
        mem_malloc_start = dest_addr;
-       mem_malloc_end = dest_addr + CFG_MALLOC_LEN;
+       mem_malloc_end = dest_addr + CONFIG_SYS_MALLOC_LEN;
        mem_malloc_brk = mem_malloc_start;
 
        memset ((void *) mem_malloc_start, 0,
@@ -202,35 +203,32 @@ static int display_dram_config (void)
        return (0);
 }
 
-#ifndef CFG_NO_FLASH
+#ifndef CONFIG_SYS_NO_FLASH
 static void display_flash_config (ulong size)
 {
        puts ("Flash: ");
        print_size (size, "\n");
 }
-#endif /* CFG_NO_FLASH */
+#endif /* CONFIG_SYS_NO_FLASH */
 
 #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
 static int init_func_i2c (void)
 {
        puts ("I2C:   ");
-       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
        puts ("ready\n");
        return (0);
 }
 #endif
 
-#ifdef CONFIG_SKIP_RELOCATE_UBOOT
-/*
- * This routine sets the relocation done flag, because even if
- * relocation is skipped, the flag is used by other generic code.
- */
-static int reloc_init(void)
+#if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
+#include <pci.h>
+static int arm_pci_init(void)
 {
-       gd->flags |= GD_FLG_RELOC;
+       pci_init();
        return 0;
 }
-#endif
+#endif /* CONFIG_CMD_PCI || CONFIG_PCI */
 
 /*
  * Breathe some life into the board...
@@ -261,11 +259,6 @@ int print_cpuinfo (void); /* test-only */
 
 init_fnc_t *init_sequence[] = {
        cpu_init,               /* basic cpu dependent setup */
-#if defined(CONFIG_SKIP_RELOCATE_UBOOT)
-       reloc_init,             /* Set the relocation done flag, must
-                                  do this AFTER cpu_init(), but as soon
-                                  as possible */
-#endif
        board_init,             /* basic board dependent setup */
        interrupt_init,         /* set up exceptions */
        env_init,               /* initialize environment */
@@ -283,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,
 };
@@ -291,7 +287,7 @@ void start_armboot (void)
 {
        init_fnc_t **init_fnc_ptr;
        char *s;
-#if !defined(CFG_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD)
+#if !defined(CONFIG_SYS_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD)
        ulong size;
 #endif
 #if defined(CONFIG_VFD) || defined(CONFIG_LCD)
@@ -299,7 +295,7 @@ void start_armboot (void)
 #endif
 
        /* Pointer is writable since we allocated a register for it */
-       gd = (gd_t*)(_armboot_start - CFG_MALLOC_LEN - sizeof(gd_t));
+       gd = (gd_t*)(_armboot_start - CONFIG_SYS_MALLOC_LEN - sizeof(gd_t));
        /* compiler optimization barrier needed for GCC >= 3.4 */
        __asm__ __volatile__("": : :"memory");
 
@@ -307,6 +303,8 @@ void start_armboot (void)
        gd->bd = (bd_t*)((char*)gd - sizeof(bd_t));
        memset (gd->bd, 0, sizeof (bd_t));
 
+       gd->flags |= GD_FLG_RELOC;
+
        monitor_flash_len = _bss_start - _armboot_start;
 
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
@@ -315,11 +313,11 @@ void start_armboot (void)
                }
        }
 
-#ifndef CFG_NO_FLASH
+#ifndef CONFIG_SYS_NO_FLASH
        /* configure available FLASH banks */
        size = flash_init ();
        display_flash_config (size);
-#endif /* CFG_NO_FLASH */
+#endif /* CONFIG_SYS_NO_FLASH */
 
 #ifdef CONFIG_VFD
 #      ifndef PAGE_SIZE
@@ -351,7 +349,7 @@ void start_armboot (void)
 #endif /* CONFIG_LCD */
 
        /* armboot_start is defined in the board-specific linker script */
-       mem_malloc_init (_armboot_start - CFG_MALLOC_LEN);
+       mem_malloc_init (_armboot_start - CONFIG_SYS_MALLOC_LEN);
 
 #if defined(CONFIG_CMD_NAND)
        puts ("NAND:  ");
@@ -513,7 +511,7 @@ int mdm_init (void)
                        serial_puts(init_str);
                        serial_puts("\n");
                        for(;;) {
-                               mdm_readline(console_buffer, CFG_CBSIZE);
+                               mdm_readline(console_buffer, CONFIG_SYS_CBSIZE);
                                dbg("ini%d: [%s]", i, console_buffer);
 
                                if ((strcmp(console_buffer, "OK") == 0) ||
@@ -537,7 +535,7 @@ int mdm_init (void)
        /* final stage - wait for connect */
        for(;i > 1;) { /* if 'i' > 1 - wait for connection
                                  message from modem */
-               mdm_readline(console_buffer, CFG_CBSIZE);
+               mdm_readline(console_buffer, CONFIG_SYS_CBSIZE);
                dbg("ini_f: [%s]", console_buffer);
                if (strncmp(console_buffer, "CONNECT", 7) == 0) {
                        dbg("ini_f: connected");