ixp/interrupts: Move conditional compilation to Makefile

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

diff --git a/cpu/sa1100/cpu.c b/cpu/sa1100/cpu.c
index d0dfa3d140b2ac0ca991c5fe845e1acbb264ac44..ed1a6f7cd30d4e4ff7b4f3cd5b09c93d54ae338a 100644 (file)
--- a/cpu/sa1100/cpu.c
+++ b/cpu/sa1100/cpu.c
@@ -38,6 +38,8 @@
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
+static void cache_flush(void);
+
 int cpu_init (void)
 {
        /*
@@ -59,76 +61,22 @@ int cleanup_before_linux (void)
         * just disable everything that can disturb booting linux
         */
 
-       unsigned long i;
-
        disable_interrupts ();
 
        /* turn off I-cache */
-       asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
-       i &= ~0x1000;
-       asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
+       icache_disable();
+       dcache_disable();
 
        /* flush I-cache */
-       asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i));
-
-       return (0);
-}
-
-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
-{
-       printf ("resetting ...\n");
+       cache_flush();
 
-       udelay (50000);                         /* wait 50 ms */
-       disable_interrupts ();
-       reset_cpu (0);
-
-       /*NOTREACHED*/
        return (0);
 }
 
-static void cp_delay (void)
-{
-       volatile int i;
-
-       /* copro seems to need some delay between reading and writing */
-       for (i = 0; i < 100; i++);
-}
-
-void icache_enable (void)
+/* flush I/D-cache */
+static void cache_flush (void)
 {
-       ulong reg;
-
-       reg = get_cr ();
-       cp_delay ();
-       set_cr (reg | CR_C);
-}
+       unsigned long i = 0;
 
-void icache_disable (void)
-{
-       ulong reg;
-
-       reg = get_cr ();
-       cp_delay ();
-       set_cr (reg & ~CR_C);
-}
-
-int icache_status (void)
-{
-       return (get_cr () & CR_C) != 0;
-}
-
-/* we will never enable dcache, because we have to setup MMU first */
-void dcache_enable (void)
-{
-       return;
-}
-
-void dcache_disable (void)
-{
-       return;
-}
-
-int dcache_status (void)
-{
-       return 0;                                       /* always off */
+       asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i));
 }