Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d33350 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent e5f8d1f0

arch/m68k/coldfire/head.S

+2 −2
Original line number Diff line number Diff line
@@ -282,8 +282,8 @@ _clear_bss: 
	movel	%d0,m68k_mmutype

	movel	#FPU_COLDFIRE,%d0

	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 */

#endif

arch/m68k/include/asm/m5441xsim.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define CPU_NAME		"COLDFIRE(m5441x)"

#define CPU_INSTR_PER_JIFFY	2

#define MCF_BUSCLK		(MCF_CLK / 2)

#define MACHINE			MACH_M5441X



#include <asm/m54xxacr.h>

arch/m68k/include/asm/m54xxsim.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define	CPU_NAME		"COLDFIRE(m54xx)"

#define	CPU_INSTR_PER_JIFFY	2

#define	MCF_BUSCLK		(MCF_CLK / 2)

#define	MACHINE			MACH_M54XX



#include <asm/m54xxacr.h>

arch/m68k/include/uapi/asm/bootinfo.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct mem_info { 
#define MACH_Q40		10

#define MACH_SUN3X		11

#define MACH_M54XX		12

#define MACH_M5441X		13





    /*

arch/m68k/kernel/setup_mm.c

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ void __init setup_arch(char **cmdline_p) 
#endif

#ifdef CONFIG_COLDFIRE

	case MACH_M54XX:

	case MACH_M5441X:

		config_BSP(NULL, 0);

		break;

#endif