Commit 91350f66 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: mxc: don't use the symbols in the CPU family choice to select others 



The symbols in this choice should only be used to select between the
available machines that can be built into a single kernel. As these sets
(will) differ e.g. depending on ARM_PATCH_PHYS_VIRT and AUTO_ZRELADDR
letting them select other symbols makes the logic more complex and needs
to duplicate some things. So let the machines select the corresponding
symbols (indirectly via SOC_XYZ).

LAKML-Reference: 1302464943-20721-2-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 13cf8df9

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config MACH_MXLADS 
config ARCH_MX1ADS

	bool "MX1ADS platform"

	select MACH_MXLADS

	select SOC_IMX1

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	help

arch/arm/mach-mx3/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARCH_MX35 


config SOC_IMX31

	bool

	select CPU_V6

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MX31
@@ -19,6 +20,7 @@ config SOC_IMX31 


config SOC_IMX35

	bool

	select CPU_V6

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2

	select HAVE_EPIT

arch/arm/mach-mx5/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ config ARCH_MX53 


config SOC_IMX50

	bool

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2
@@ -21,6 +23,8 @@ config SOC_IMX50 


config	SOC_IMX51

	bool

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2
@@ -29,6 +33,8 @@ config SOC_IMX51 


config	SOC_IMX53

	bool

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MX53

arch/arm/plat-mxc/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ choice 


config ARCH_MX1

	bool "MX1-based"

	select SOC_IMX1

	help

	  This enables support for systems based on the Freescale i.MX1 family
@@ -26,14 +25,11 @@ config ARCH_MX25 


config ARCH_MX3

	bool "MX3-based"

	select CPU_V6

	help

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



config ARCH_MX5

	bool "MX5-based"

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	help

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE