Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/printk',...

[pandora-kernel.git] / arch / sparc / kernel / setup.c

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index 9e451b2..24fe307 100644 (file)
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -213,23 +213,25 @@ void __init setup_arch(char **cmdline_p)
        /* Initialize PROM console and command line. */
        *cmdline_p = prom_getbootargs();
        strcpy(boot_command_line, *cmdline_p);
+       parse_early_param();
 
        /* Set sparc_cpu_model */
        sparc_cpu_model = sun_unknown;
-       if(!strcmp(&cputypval,"sun4 ")) { sparc_cpu_model=sun4; }
-       if(!strcmp(&cputypval,"sun4c")) { sparc_cpu_model=sun4c; }
-       if(!strcmp(&cputypval,"sun4m")) { sparc_cpu_model=sun4m; }
-       if(!strcmp(&cputypval,"sun4s")) { sparc_cpu_model=sun4m; }  /* CP-1200 with PROM 2.30 -E */
-       if(!strcmp(&cputypval,"sun4d")) { sparc_cpu_model=sun4d; }
-       if(!strcmp(&cputypval,"sun4e")) { sparc_cpu_model=sun4e; }
-       if(!strcmp(&cputypval,"sun4u")) { sparc_cpu_model=sun4u; }
-
-#ifdef CONFIG_SUN4
-       if (sparc_cpu_model != sun4) {
-               prom_printf("This kernel is for Sun4 architecture only.\n");
-               prom_halt();
-       }
-#endif
+       if (!strcmp(&cputypval,"sun4 "))
+               sparc_cpu_model = sun4;
+       if (!strcmp(&cputypval,"sun4c"))
+               sparc_cpu_model = sun4c;
+       if (!strcmp(&cputypval,"sun4m"))
+               sparc_cpu_model = sun4m;
+       if (!strcmp(&cputypval,"sun4s"))
+               sparc_cpu_model = sun4m; /* CP-1200 with PROM 2.30 -E */
+       if (!strcmp(&cputypval,"sun4d"))
+               sparc_cpu_model = sun4d;
+       if (!strcmp(&cputypval,"sun4e"))
+               sparc_cpu_model = sun4e;
+       if (!strcmp(&cputypval,"sun4u"))
+               sparc_cpu_model = sun4u;
+
        printk("ARCH: ");
        switch(sparc_cpu_model) {
        case sun4:
@@ -263,7 +265,7 @@ void __init setup_arch(char **cmdline_p)
        boot_flags_init(*cmdline_p);
 
        idprom_init();
-       if (ARCH_SUN4C_SUN4)
+       if (ARCH_SUN4C)
                sun4c_probe_vac();
        load_mmu();