From 857e8e580c318128f3a4dc025815a62192568a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 22 Mar 2011 11:54:35 +0100 Subject: [PATCH] --- yaml --- r: 250043 b: refs/heads/master c: 91350f6677f988b2342b214338520d1c3ed1ea0e h: refs/heads/master i: 250041: 8b71e0688678a7994b4bbb4febb4f1ca6589a36a 250039: b508265009ac1e1b4a1846233140c5a2e76928d9 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 1 + trunk/arch/arm/mach-mx3/Kconfig | 2 ++ trunk/arch/arm/mach-mx5/Kconfig | 6 ++++++ trunk/arch/arm/plat-mxc/Kconfig | 4 ---- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4f5418b06a4e..625f1fed6aeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13cf8df97d075cf61445c689a30c8b0ce70b415f +refs/heads/master: 91350f6677f988b2342b214338520d1c3ed1ea0e diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 4ac00e9fdbe8..299580676dc8 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -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 diff --git a/trunk/arch/arm/mach-mx3/Kconfig b/trunk/arch/arm/mach-mx3/Kconfig index cb7d4a3a092a..647811e539df 100644 --- a/trunk/arch/arm/mach-mx3/Kconfig +++ b/trunk/arch/arm/mach-mx3/Kconfig @@ -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 diff --git a/trunk/arch/arm/mach-mx5/Kconfig b/trunk/arch/arm/mach-mx5/Kconfig index 49b5661f01c2..b3570e6c8e12 100644 --- a/trunk/arch/arm/mach-mx5/Kconfig +++ b/trunk/arch/arm/mach-mx5/Kconfig @@ -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 diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig index debd7be52450..8b7ab8ce9711 100644 --- a/trunk/arch/arm/plat-mxc/Kconfig +++ b/trunk/arch/arm/plat-mxc/Kconfig @@ -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