Commit e780d239 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: prepare deprecating ARCH_MX1, MACH_MX2, MACH_MX21 and MACH_MX27 



MACH_... is reserved for machine support, so use SOC as prefix, not MACH.

This introduces new symbols SOC_IMX1, SOC_IMX21 and SOC_IMX27.  They are
selected by the old symbols for now.  There is no substitute for MACH_MX2
as most usages of MX2 only means MX21 + MX27 but not MX25.

Later the choice about CPU and CPU family should go away and the individual
machines should select the right SOC symbol.  This is a precondition to
support more than one SOC in a single kernel image.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent b6b06be0

arch/arm/mach-imx/Kconfig

+19 −2
Original line number Diff line number Diff line 
if ARCH_MX1



config SOC_IMX1

	select CPU_ARM920T

	select IMX_HAVE_IOMUX_V1

	bool



comment "MX1 platforms:"

config MACH_MXLADS

	bool
@@ -19,19 +24,31 @@ endif 


if ARCH_MX2



config SOC_IMX21

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_IOMUX_V1

	bool



config SOC_IMX27

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_IOMUX_V1

	bool



choice

	prompt "CPUs:"

	default MACH_MX21



config MACH_MX21

	bool "i.MX21 support"

	select ARCH_MXC_AUDMUX_V1

	select SOC_IMX21

	help

	  This enables support for Freescale's MX2 based i.MX21 processor.



config MACH_MX27

	bool "i.MX27 support"

	select ARCH_MXC_AUDMUX_V1

	select SOC_IMX27

	help

	  This enables support for Freescale's MX2 based i.MX27 processor.

arch/arm/plat-mxc/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -8,15 +8,12 @@ choice 


config ARCH_MX1

	bool "MX1-based"

	select CPU_ARM920T

	select IMX_HAVE_IOMUX_V1

	select SOC_IMX1

	help

	  This enables support for systems based on the Freescale i.MX1 family



config ARCH_MX2

	bool "MX2-based"

	select CPU_ARM926T

	select IMX_HAVE_IOMUX_V1

	help

	  This enables support for systems based on the Freescale i.MX2 family

CRA Git | Maintained and supported by SUSTech CRA and CCSE