GCC-4.x fixes: clean up global data pointer initialization for all boards.

[karo-tx-uboot.git] / lib_i386 / board.c

diff --git a/lib_i386/board.c b/lib_i386/board.c
index b26d3d5eb1155880e56edac9b7de7dffa3af7ab6..4175fdb1c49a01c44471fc54ef0d8c96106f36b8 100644 (file)
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -38,6 +38,8 @@
 #include <ide.h>
 #include <asm/u-boot-i386.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern long _i386boot_start;
 extern long _i386boot_end;
 extern long _i386boot_romdata_start;
@@ -80,8 +82,6 @@ static ulong mem_malloc_brk = 0;
 
 static int mem_malloc_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* start malloc area right after the stack */
        mem_malloc_start = i386boot_bss_start +
                i386boot_bss_size + CFG_STACK_SIZE;
@@ -130,8 +130,6 @@ char *strmhz (char *buf, long hz)
  */
 static int init_baudrate (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        char tmp[64];   /* long enough for environment variables */
        int i = getenv_r("baudrate", tmp, 64);
 
@@ -167,7 +165,6 @@ static int display_banner (void)
  */
 static int display_dram_config (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int i;
 
        puts ("DRAM Configuration:\n");
@@ -233,7 +230,6 @@ gd_t *global_data;
 
 void start_i386boot (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        char *s;
        int i;
        ulong size;
@@ -244,6 +240,8 @@ void start_i386boot (void)
        show_boot_progress(0x21);
 
        gd = global_data = &gd_data;
+       /* compiler optimization barrier needed for GCC >= 3.4 */
+       __asm__ __volatile__("": : :"memory");
 
        memset (gd, 0, sizeof (gd_t));
        gd->bd = &bd_data;
@@ -315,15 +313,6 @@ void start_i386boot (void)
        misc_init_r();
 #endif
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && (0)
-       WATCHDOG_RESET();
-# ifdef DEBUG
-       puts ("Reset Ethernet PHY\n");
-# endif
-       reset_phy();
-#endif
-
 #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
        WATCHDOG_RESET();
        puts ("PCMCIA:");
@@ -385,12 +374,22 @@ void start_i386boot (void)
        doc_init();
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_NET_MULTI)
        WATCHDOG_RESET();
        puts("Net:   ");
+#endif
        eth_initialize(gd->bd);
 #endif
 
+#if (CONFIG_COMMANDS & CFG_CMD_NET) && (0)
+       WATCHDOG_RESET();
+# ifdef DEBUG
+       puts ("Reset Ethernet PHY\n");
+# endif
+       reset_phy();
+#endif
+
 #ifdef CONFIG_LAST_STAGE_INIT
        WATCHDOG_RESET();
        /*