aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2016-02-25 07:59:13 -0500
committerGreg Ungerer <gerg@uclinux.org>2016-03-06 19:07:17 -0500
commita3595962d82495f51a80feb19dcdb135556a9527 (patch)
tree422367364254b4457bf8ac3fed1097eb6f2139f1 /arch/m68k/kernel
parentca6fafd183d6d687a7957e5328ecefc785f22a5a (diff)
m68knommu: remove obsolete 68360 support
Remove the obsolete Motorola/Freescale 68360 SoC support. It has been bit rotting for many years with little active use in mainlne. There has been no serial driver support for many years, so it is largely not useful in its current state. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r--arch/m68k/kernel/early_printk.c8
-rw-r--r--arch/m68k/kernel/setup_no.c7
2 files changed, 4 insertions, 11 deletions
diff --git a/arch/m68k/kernel/early_printk.c b/arch/m68k/kernel/early_printk.c
index ff9708d71921..7d3fe08a48eb 100644
--- a/arch/m68k/kernel/early_printk.c
+++ b/arch/m68k/kernel/early_printk.c
@@ -20,8 +20,8 @@ asmlinkage void __init debug_cons_nputs(const char *s, unsigned n);
20static void __ref debug_cons_write(struct console *c, 20static void __ref debug_cons_write(struct console *c,
21 const char *s, unsigned n) 21 const char *s, unsigned n)
22{ 22{
23#if !(defined(CONFIG_SUN3) || defined(CONFIG_M68360) || \ 23#if !(defined(CONFIG_SUN3) || defined(CONFIG_M68000) || \
24 defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE)) 24 defined(CONFIG_COLDFIRE))
25 if (MACH_IS_MVME16x) 25 if (MACH_IS_MVME16x)
26 mvme16x_cons_write(c, s, n); 26 mvme16x_cons_write(c, s, n);
27 else 27 else
@@ -52,8 +52,8 @@ early_param("earlyprintk", setup_early_printk);
52 * debug_cons_nputs() defined in arch/m68k/kernel/head.S cannot be called 52 * debug_cons_nputs() defined in arch/m68k/kernel/head.S cannot be called
53 * after init sections are discarded (for platforms that use it). 53 * after init sections are discarded (for platforms that use it).
54 */ 54 */
55#if !(defined(CONFIG_SUN3) || defined(CONFIG_M68360) || \ 55#if !(defined(CONFIG_SUN3) || defined(CONFIG_M68000) || \
56 defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE)) 56 defined(CONFIG_COLDFIRE))
57 57
58static int __init unregister_early_console(void) 58static int __init unregister_early_console(void)
59{ 59{
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 76b9113f3092..9309789215a8 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -68,9 +68,6 @@ void (*mach_power_off)(void);
68#define CPU_NAME "MC68000" 68#define CPU_NAME "MC68000"
69#endif 69#endif
70#endif /* CONFIG_M68000 */ 70#endif /* CONFIG_M68000 */
71#ifdef CONFIG_M68360
72#define CPU_NAME "MC68360"
73#endif
74#ifndef CPU_NAME 71#ifndef CPU_NAME
75#define CPU_NAME "UNKNOWN" 72#define CPU_NAME "UNKNOWN"
76#endif 73#endif
@@ -209,10 +206,6 @@ void __init setup_arch(char **cmdline_p)
209#if defined( CONFIG_PILOT ) && defined( CONFIG_M68EZ328 ) 206#if defined( CONFIG_PILOT ) && defined( CONFIG_M68EZ328 )
210 printk(KERN_INFO "PalmV support by Lineo Inc. <jeff@uclinux.com>\n"); 207 printk(KERN_INFO "PalmV support by Lineo Inc. <jeff@uclinux.com>\n");
211#endif 208#endif
212#if defined (CONFIG_M68360)
213 printk(KERN_INFO "QUICC port done by SED Systems <hamilton@sedsystems.ca>,\n");
214 printk(KERN_INFO "based on 2.0.38 port by Lineo Inc. <mleslie@lineo.com>.\n");
215#endif
216#ifdef CONFIG_DRAGEN2 209#ifdef CONFIG_DRAGEN2
217 printk(KERN_INFO "DragonEngine II board support by Georges Menie\n"); 210 printk(KERN_INFO "DragonEngine II board support by Georges Menie\n");
218#endif 211#endif