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

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

diff --git a/cpu/pxa/cpu.c b/cpu/pxa/cpu.c
index abb064ad01374bd30c630d254045f6ff2632789b..0ee8180361f5f43e5fcbb066d52d6e87e211a9e1 100644 (file)
--- a/cpu/pxa/cpu.c
+++ b/cpu/pxa/cpu.c
@@ -34,14 +34,16 @@
 #include <command.h>
 #include <asm/arch/pxa-regs.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
@@ -74,8 +76,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 */
@@ -145,6 +145,7 @@ int dcache_status (void)
        return 0;                                       /* always off */
 }
 
+#ifndef CONFIG_CPU_MONAHANS
 void set_GPIO_mode(int gpio_mode)
 {
        int gpio = gpio_mode & GPIO_MD_MASK_NR;
@@ -162,3 +163,4 @@ void set_GPIO_mode(int gpio_mode)
        gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2));
        GAFR(gpio) = gafr |  (fn  << (((gpio) & 0xf)*2));
 }
+#endif /* CONFIG_CPU_MONAHANS */