m68knommu: move ColdFire CPU names into their headers

Move the ColdFire CPU names out of setup.c and into their repsective
headers. That way when we add new ones we won't need to modify
setup.c any more.

Add the missing 548x CPU name.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68k/include/asm/m5206sim.h b/arch/m68k/include/asm/m5206sim.h
index 9c384e294af9b172e4e258226739aab9b82c3552..6cc7a42cc4257a11378d58752a2ec3cefe508c61 100644 (file)
--- a/arch/m68k/include/asm/m5206sim.h
+++ b/arch/m68k/include/asm/m5206sim.h
@@ -12,6 +12,7 @@
 #define        m5206sim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m5206)"
 
 /*
  *     Define the 5206 SIM register set addresses.

diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
index db824a4b136ea5a8bf39f4da57b2cdc068e6d97b..afa211858ecb1550572e6f83f3dc2b4d8f92de9b 100644 (file)
--- a/arch/m68k/include/asm/m520xsim.h
+++ b/arch/m68k/include/asm/m520xsim.h
@@ -11,6 +11,8 @@
 #define m520xsim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m520x)"
+
 /*
  *  Define the 520x SIM register set addresses.
  */

diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h
index e8d06b24a48ea4e65478d9ef043a9cfcf1eb83d6..6a2c90d74d1556b390a2a2fcad2f5ed57876cda6 100644 (file)
--- a/arch/m68k/include/asm/m523xsim.h
+++ b/arch/m68k/include/asm/m523xsim.h
@@ -11,6 +11,7 @@
 #define        m523xsim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m523x)"
 
 /*
  *     Define the 523x SIM register set addresses.

diff --git a/arch/m68k/include/asm/m5249sim.h b/arch/m68k/include/asm/m5249sim.h
index 79b7b402f3c984a48eda4aedb65f20995e672a50..6c49ed88845c3f200d0f5e76449089914dc11504 100644 (file)
--- a/arch/m68k/include/asm/m5249sim.h
+++ b/arch/m68k/include/asm/m5249sim.h
@@ -11,6 +11,8 @@
 #define        m5249sim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m5249)"
+
 /*
  *     Define the 5249 SIM register set addresses.
  */

diff --git a/arch/m68k/include/asm/m5272sim.h b/arch/m68k/include/asm/m5272sim.h
index df3332c2317de8ae95eff60752596b5e0b962793..7edef8fc1920e3cc7826d5717fc52cb94a5fc02e 100644 (file)
--- a/arch/m68k/include/asm/m5272sim.h
+++ b/arch/m68k/include/asm/m5272sim.h
@@ -12,6 +12,8 @@
 #define        m5272sim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m5272)"
+
 /*
  *     Define the 5272 SIM register set addresses.
  */

diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index 1feb46f108ce79bdbf5561f29a084ae87ed53107..627156a1d96aa9233fc376bea369dc7829cf838f 100644 (file)
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -11,6 +11,8 @@
 #define        m527xsim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m527x)"
+
 
 /*
  *     Define the 5270/5271 SIM register set addresses.

diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h
index 891cbedad97269ad99fa0cf4e885a42b0610491a..03a6d576787c3d5ec7c1f8e41b313e16b4f0b609 100644 (file)
--- a/arch/m68k/include/asm/m528xsim.h
+++ b/arch/m68k/include/asm/m528xsim.h
@@ -11,6 +11,7 @@
 #define        m528xsim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m528x)"
 
 /*
  *     Define the 5280/5282 SIM register set addresses.

diff --git a/arch/m68k/include/asm/m5307sim.h b/arch/m68k/include/asm/m5307sim.h
index c6830e5b54ce0bdb0dae58f95b03505bc609321e..3e06b8379a493674eb54dfaaf750b51a4f25836e 100644 (file)
--- a/arch/m68k/include/asm/m5307sim.h
+++ b/arch/m68k/include/asm/m5307sim.h
@@ -14,6 +14,8 @@
 #define        m5307sim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m5307)"
+
 /*
  *     Define the 5307 SIM register set addresses.
  */

diff --git a/arch/m68k/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h
index c4bf1c81e3cfa5255901fa2c9c2b817d2173e968..9f4688bcc4540f2a72a1ed992f2d79d134346113 100644 (file)
--- a/arch/m68k/include/asm/m532xsim.h
+++ b/arch/m68k/include/asm/m532xsim.h
@@ -9,6 +9,8 @@
 #define        m532xsim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m532x)"
+
 #define MCF_REG32(x) (*(volatile unsigned long  *)(x))
 #define MCF_REG16(x) (*(volatile unsigned short *)(x))
 #define MCF_REG08(x) (*(volatile unsigned char  *)(x))

diff --git a/arch/m68k/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h
index 2099435e10c756b59893389e0c5e20c5a6184e9a..1de44c5affe0e09dc1ff52793c1a95f95c0f4778 100644 (file)
--- a/arch/m68k/include/asm/m5407sim.h
+++ b/arch/m68k/include/asm/m5407sim.h
@@ -14,6 +14,8 @@
 #define        m5407sim_h
 /****************************************************************************/
 
+#define        CPU_NAME        "COLDFIRE(m5407)"
+
 /*
  *     Define the 5407 SIM register set addresses.
  */

diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h
index c46826c900b37607189aac91bca69b6b3b275caa..d69a64fd3bdebcd76c7e401293fcddec111706b8 100644 (file)
--- a/arch/m68k/include/asm/m54xxsim.h
+++ b/arch/m68k/include/asm/m54xxsim.h
@@ -5,6 +5,8 @@
 #ifndef        m54xxsim_h
 #define m54xxsim_h
 
+#define        CPU_NAME        "COLDFIRE(m54xx)"
+
 #define MCFINT_VECBASE      64
 
 /*

diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index c684adf5dc40dfb8f4d4ce4d519d35e7023a4ff8..f48d9df484d3f5346741e56c181fbc77b318b2bb 100644 (file)
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -55,55 +55,22 @@ 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)"
-#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"
+/*
+ * The ColdFire CPU names are defined in their headers.
+ */
+#ifndef CPU_NAME
+#define        CPU_NAME        "UNKNOWN"
 #endif
 
 extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
@@ -208,7 +175,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");
@@ -303,7 +270,7 @@ 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";