Explorar o código

m68k: set appropriate machine type for m5411x SoC platforms

Create a new machine type for platforms based around the ColdFire 5441x
SoC family. Set that machine type on startup when building for this
platform type.

Currently the ColdFire head.S hard codes a M54xx machine type at startup -
since that is the only platform type currently supported with MMU enabled.
The m5441x has an MMU and this change forms part of the support required
to run it with the MMU enabled.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Greg Ungerer %!s(int64=9) %!d(string=hai) anos
pai
achega
81d33350ba

+ 2 - 2
arch/m68k/coldfire/head.S

@@ -282,8 +282,8 @@ _clear_bss:
 	movel	%d0,m68k_mmutype
 	movel	%d0,m68k_mmutype
 	movel	#FPU_COLDFIRE,%d0
 	movel	#FPU_COLDFIRE,%d0
 	movel	%d0,m68k_fputype
 	movel	%d0,m68k_fputype
-	movel	#MACH_M54XX,%d0
-	movel	%d0,m68k_machtype		/* Mark us as a 54xx machine */
+	movel	#MACHINE,%d0
+	movel	%d0,m68k_machtype		/* Mark machine type */
 	lea	init_task,%a2			/* Set "current" init task */
 	lea	init_task,%a2			/* Set "current" init task */
 #endif
 #endif
 
 

+ 1 - 0
arch/m68k/include/asm/m5441xsim.h

@@ -10,6 +10,7 @@
 #define CPU_NAME		"COLDFIRE(m5441x)"
 #define CPU_NAME		"COLDFIRE(m5441x)"
 #define CPU_INSTR_PER_JIFFY	2
 #define CPU_INSTR_PER_JIFFY	2
 #define MCF_BUSCLK		(MCF_CLK / 2)
 #define MCF_BUSCLK		(MCF_CLK / 2)
+#define MACHINE			MACH_M5441X
 
 
 #include <asm/m54xxacr.h>
 #include <asm/m54xxacr.h>
 
 

+ 1 - 0
arch/m68k/include/asm/m54xxsim.h

@@ -8,6 +8,7 @@
 #define	CPU_NAME		"COLDFIRE(m54xx)"
 #define	CPU_NAME		"COLDFIRE(m54xx)"
 #define	CPU_INSTR_PER_JIFFY	2
 #define	CPU_INSTR_PER_JIFFY	2
 #define	MCF_BUSCLK		(MCF_CLK / 2)
 #define	MCF_BUSCLK		(MCF_CLK / 2)
+#define	MACHINE			MACH_M54XX
 
 
 #include <asm/m54xxacr.h>
 #include <asm/m54xxacr.h>
 
 

+ 1 - 0
arch/m68k/include/uapi/asm/bootinfo.h

@@ -81,6 +81,7 @@ struct mem_info {
 #define MACH_Q40		10
 #define MACH_Q40		10
 #define MACH_SUN3X		11
 #define MACH_SUN3X		11
 #define MACH_M54XX		12
 #define MACH_M54XX		12
+#define MACH_M5441X		13
 
 
 
 
     /*
     /*

+ 1 - 0
arch/m68k/kernel/setup_mm.c

@@ -341,6 +341,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
 #ifdef CONFIG_COLDFIRE
 #ifdef CONFIG_COLDFIRE
 	case MACH_M54XX:
 	case MACH_M54XX:
+	case MACH_M5441X:
 		config_BSP(NULL, 0);
 		config_BSP(NULL, 0);
 		break;
 		break;
 #endif
 #endif