Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

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

diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index c684adf..16b2de7 100644 (file)
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -55,55 +55,29 @@ void (*mach_halt)(void);
 void (*mach_power_off)(void);
 
 #ifdef CONFIG_M68328
-       #define CPU "MC68328"
+#define CPU_NAME       "MC68328"
 #endif
 #ifdef CONFIG_M68EZ328
-       #define CPU "MC68EZ328"
+#define CPU_NAME       "MC68EZ328"
 #endif
 #ifdef CONFIG_M68VZ328
-       #define CPU "MC68VZ328"
+#define CPU_NAME       "MC68VZ328"
 #endif
 #ifdef CONFIG_M68360
-       #define CPU "MC68360"
+#define CPU_NAME       "MC68360"
 #endif
-#if defined(CONFIG_M5206)
-       #define CPU "COLDFIRE(m5206)"
+#ifndef CPU_NAME
+#define        CPU_NAME        "UNKNOWN"
 #endif
-#if defined(CONFIG_M5206e)
-       #define CPU "COLDFIRE(m5206e)"
-#endif
-#if defined(CONFIG_M520x)
-       #define CPU "COLDFIRE(m520x)"
-#endif
-#if defined(CONFIG_M523x)
-       #define CPU "COLDFIRE(m523x)"
-#endif
-#if defined(CONFIG_M5249)
-       #define CPU "COLDFIRE(m5249)"
-#endif
-#if defined(CONFIG_M5271)
-       #define CPU "COLDFIRE(m5270/5271)"
-#endif
-#if defined(CONFIG_M5272)
-       #define CPU "COLDFIRE(m5272)"
-#endif
-#if defined(CONFIG_M5275)
-       #define CPU "COLDFIRE(m5274/5275)"
-#endif
-#if defined(CONFIG_M528x)
-       #define CPU "COLDFIRE(m5280/5282)"
-#endif
-#if defined(CONFIG_M5307)
-       #define CPU "COLDFIRE(m5307)"
-#endif
-#if defined(CONFIG_M532x)
-       #define CPU "COLDFIRE(m532x)"
-#endif
-#if defined(CONFIG_M5407)
-       #define CPU "COLDFIRE(m5407)"
-#endif
-#ifndef CPU
-       #define CPU "UNKNOWN"
+
+/*
+ * Different cores have different instruction execution timings.
+ * The old/traditional 68000 cores are basically all the same, at 16.
+ * The ColdFire cores vary a little, their values are defined in their
+ * headers. We default to the standard 68000 value here.
+ */
+#ifndef CPU_INSTR_PER_JIFFY
+#define        CPU_INSTR_PER_JIFFY     16
 #endif
 
 extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
@@ -208,7 +182,7 @@ void __init setup_arch(char **cmdline_p)
        command_line[sizeof(command_line) - 1] = 0;
 #endif /* CONFIG_UBOOT */
 
-       printk(KERN_INFO "\x0F\r\n\nuClinux/" CPU "\n");
+       printk(KERN_INFO "\x0F\r\n\nuClinux/" CPU_NAME "\n");
 
 #ifdef CONFIG_UCDIMM
        printk(KERN_INFO "uCdimm by Lineo, Inc. <www.lineo.com>\n");
@@ -257,11 +231,6 @@ void __init setup_arch(char **cmdline_p)
        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
        boot_command_line[COMMAND_LINE_SIZE-1] = 0;
 
-#ifdef DEBUG
-       if (strlen(*cmdline_p))
-               printk(KERN_DEBUG "Command line: '%s'\n", *cmdline_p);
-#endif
-
 #if defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_DUMMY_CONSOLE)
        conswitchp = &dummy_con;
 #endif
@@ -303,15 +272,10 @@ static int show_cpuinfo(struct seq_file *m, void *v)
        char *cpu, *mmu, *fpu;
        u_long clockfreq;
 
-       cpu = CPU;
+       cpu = CPU_NAME;
        mmu = "none";
        fpu = "none";
-
-#ifdef CONFIG_COLDFIRE
-       clockfreq = (loops_per_jiffy * HZ) * 3;
-#else
-       clockfreq = (loops_per_jiffy * HZ) * 16;
-#endif
+       clockfreq = (loops_per_jiffy * HZ) * CPU_INSTR_PER_JIFFY;
 
        seq_printf(m, "CPU:\t\t%s\n"
                      "MMU:\t\t%s\n"