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

[u-boot] / cpu / sa1100 / cpu.c

diff --git a/cpu/sa1100/cpu.c b/cpu/sa1100/cpu.c
index 34adf91ad1ba647d65a37346a545ca78d8afe51d..f1bd6440933b4bc5edd72f32e08e1312628c4b07 100644 (file)
--- a/cpu/sa1100/cpu.c
+++ b/cpu/sa1100/cpu.c
@@ -33,14 +33,16 @@
 #include <common.h>
 #include <command.h>
 
+#ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
 int cpu_init (void)
 {
        /*
         * setup up stacks if necessary
         */
 #ifdef CONFIG_USE_IRQ
-       DECLARE_GLOBAL_DATA_PTR;
-
        IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
        FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
 #endif
@@ -73,8 +75,6 @@ int cleanup_before_linux (void)
 
 int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       extern void reset_cpu (ulong addr);
-
        printf ("resetting ...\n");
 
        udelay (50000);                         /* wait 50 ms */