m68knommu: add smc91x support to ColdFire 5249 platform

[safe/jmp/linux-2.6] / arch / mips / mipssim / sim_setup.c

diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c
index 17819b5..55f22a3 100644 (file)
--- a/arch/mips/mipssim/sim_setup.c
+++ b/arch/mips/mipssim/sim_setup.c
@@ -22,7 +22,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/ioport.h>
-#include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
@@ -37,12 +36,8 @@
 #include <asm/mips-boards/simint.h>
 
 
-extern void sim_time_init(void);
 static void __init serial_init(void);
-unsigned int _isbonito = 0;
-
-extern void __init sanitize_tlb_entries(void);
-
+unsigned int _isbonito;
 
 const char *get_system_type(void)
 {
@@ -54,24 +49,29 @@ void __init plat_mem_setup(void)
        set_io_port_base(0xbfd00000);
 
        serial_init();
-
-       board_time_init = sim_time_init;
-       pr_info("Linux started...\n");
-
-#ifdef CONFIG_MIPS_MT_SMP
-       sanitize_tlb_entries();
-#endif
 }
 
+extern struct plat_smp_ops ssmtc_smp_ops;
+
 void __init prom_init(void)
 {
        set_io_port_base(0xbfd00000);
 
-       pr_info("\nLINUX started...\n");
-       prom_init_cmdline();
        prom_meminit();
-}
 
+#ifdef CONFIG_MIPS_MT_SMP
+       if (cpu_has_mipsmt)
+               register_smp_ops(&vsmp_smp_ops);
+       else
+               register_smp_ops(&up_smp_ops);
+#endif
+#ifdef CONFIG_MIPS_MT_SMTC
+       if (cpu_has_mipsmt)
+               register_smp_ops(&ssmtc_smp_ops);
+       else
+               register_smp_ops(&up_smp_ops);
+#endif
+}
 
 static void __init serial_init(void)
 {