Modify the CPU names (as displayed by /proc/cpuinfo) for the non-MMU
parts to be more consistent with the naming style used on the traditional
MMU parts.
The MMU parts use a simple form like: "680x0" or "68060". So modify the
names for non-MMU parts to look similar, changing like these examples:
MC68000 --> 68000
MC68328 --> 68328
MC68EZ328 --> 68ez328
COLDFIRE(m5206) --> 5206
COLDFIRE(m527x) --> 527x
Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxxxxx>
---
arch/m68k/include/asm/m5206sim.h | 2 +-
arch/m68k/include/asm/m520xsim.h | 2 +-
arch/m68k/include/asm/m523xsim.h | 2 +-
arch/m68k/include/asm/m525xsim.h | 2 +-
arch/m68k/include/asm/m5272sim.h | 2 +-
arch/m68k/include/asm/m527xsim.h | 2 +-
arch/m68k/include/asm/m528xsim.h | 2 +-
arch/m68k/include/asm/m5307sim.h | 2 +-
arch/m68k/include/asm/m53xxsim.h | 2 +-
arch/m68k/include/asm/m5407sim.h | 2 +-
arch/m68k/include/asm/m5441xsim.h | 2 +-
arch/m68k/include/asm/m54xxsim.h | 2 +-
arch/m68k/kernel/setup_no.c | 10 +++++-----
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/m68k/include/asm/m5206sim.h b/arch/m68k/include/asm/m5206sim.h
index ceb42670aee5..51f75d328bad 100644
--- a/arch/m68k/include/asm/m5206sim.h
+++ b/arch/m68k/include/asm/m5206sim.h
@@ -13,7 +13,7 @@
#define m5206sim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m5206)"
+#define CPU_NAME "5206"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK MCF_CLK
diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
index 8b3da5624a73..af2c708a528c 100644
--- a/arch/m68k/include/asm/m520xsim.h
+++ b/arch/m68k/include/asm/m520xsim.h
@@ -12,7 +12,7 @@
#define m520xsim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m520x)"
+#define CPU_NAME "520x"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h
index a3082411abee..aacabb028372 100644
--- a/arch/m68k/include/asm/m523xsim.h
+++ b/arch/m68k/include/asm/m523xsim.h
@@ -12,7 +12,7 @@
#define m523xsim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m523x)"
+#define CPU_NAME "523x"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
diff --git a/arch/m68k/include/asm/m525xsim.h b/arch/m68k/include/asm/m525xsim.h
index de01b701d95f..2cb54f656701 100644
--- a/arch/m68k/include/asm/m525xsim.h
+++ b/arch/m68k/include/asm/m525xsim.h
@@ -18,7 +18,7 @@
* little differences between them, but most of the peripheral support
* can be used by all of them.
*/
-#define CPU_NAME "COLDFIRE(m525x)"
+#define CPU_NAME "525x"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
diff --git a/arch/m68k/include/asm/m5272sim.h b/arch/m68k/include/asm/m5272sim.h
index 135dd50f0f8f..19c24dd8a900 100644
--- a/arch/m68k/include/asm/m5272sim.h
+++ b/arch/m68k/include/asm/m5272sim.h
@@ -13,7 +13,7 @@
#define m5272sim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m5272)"
+#define CPU_NAME "5272"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK MCF_CLK
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index d92814bf9915..2a517b31e728 100644
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -12,7 +12,7 @@
#define m527xsim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m527x)"
+#define CPU_NAME "527x"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
diff --git a/arch/m68k/include/asm/m528xsim.h b/arch/m68k/include/asm/m528xsim.h
index 7b60a57e9b70..1b582e852520 100644
--- a/arch/m68k/include/asm/m528xsim.h
+++ b/arch/m68k/include/asm/m528xsim.h
@@ -12,7 +12,7 @@
#define m528xsim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m528x)"
+#define CPU_NAME "528x"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK MCF_CLK
diff --git a/arch/m68k/include/asm/m5307sim.h b/arch/m68k/include/asm/m5307sim.h
index 25059f20524b..46149e3341b5 100644
--- a/arch/m68k/include/asm/m5307sim.h
+++ b/arch/m68k/include/asm/m5307sim.h
@@ -15,7 +15,7 @@
#define m5307sim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m5307)"
+#define CPU_NAME "5307"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
diff --git a/arch/m68k/include/asm/m53xxsim.h b/arch/m68k/include/asm/m53xxsim.h
index 22c1c92b9811..db3b8c684979 100644
--- a/arch/m68k/include/asm/m53xxsim.h
+++ b/arch/m68k/include/asm/m53xxsim.h
@@ -10,7 +10,7 @@
#define m53xxsim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m53xx)"
+#define CPU_NAME "53xx"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 3)
diff --git a/arch/m68k/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h
index 0c2720d8ede9..e48d76b13934 100644
--- a/arch/m68k/include/asm/m5407sim.h
+++ b/arch/m68k/include/asm/m5407sim.h
@@ -15,7 +15,7 @@
#define m5407sim_h
/****************************************************************************/
-#define CPU_NAME "COLDFIRE(m5407)"
+#define CPU_NAME "5407"
#define CPU_INSTR_PER_JIFFY 3
#define MCF_BUSCLK (MCF_CLK / 2)
diff --git a/arch/m68k/include/asm/m5441xsim.h b/arch/m68k/include/asm/m5441xsim.h
index f48cf63bd782..bb713b2f0c71 100644
--- a/arch/m68k/include/asm/m5441xsim.h
+++ b/arch/m68k/include/asm/m5441xsim.h
@@ -8,7 +8,7 @@
#ifndef m5441xsim_h
#define m5441xsim_h
-#define CPU_NAME "COLDFIRE(m5441x)"
+#define CPU_NAME "5441x"
#define CPU_INSTR_PER_JIFFY 2
#define MCF_BUSCLK (MCF_CLK / 2)
#define MACHINE MACH_M5441X
diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h
index 2a3305f6fac6..6a9b62e3f376 100644
--- a/arch/m68k/include/asm/m54xxsim.h
+++ b/arch/m68k/include/asm/m54xxsim.h
@@ -6,7 +6,7 @@
#ifndef m54xxsim_h
#define m54xxsim_h
-#define CPU_NAME "COLDFIRE(m54xx)"
+#define CPU_NAME "54xx"
#define CPU_INSTR_PER_JIFFY 2
#define MCF_BUSCLK (MCF_CLK / 2)
#define MACHINE MACH_M54XX
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 37fb663559b4..3e8ef6eb894c 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -57,17 +57,17 @@ void (*mach_halt)(void);
#ifdef CONFIG_M68000
#if defined(CONFIG_M68328)
-#define CPU_NAME "MC68328"
+#define CPU_NAME "68328"
#elif defined(CONFIG_M68EZ328)
-#define CPU_NAME "MC68EZ328"
+#define CPU_NAME "68ez328"
#elif defined(CONFIG_M68VZ328)
-#define CPU_NAME "MC68VZ328"
+#define CPU_NAME "68vz328"
#else
-#define CPU_NAME "MC68000"
+#define CPU_NAME "68000"
#endif
#endif /* CONFIG_M68000 */
#ifndef CPU_NAME
-#define CPU_NAME "UNKNOWN"
+#define CPU_NAME "unknown"
#endif
/*
--
2.25.1
