diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 15:33:38 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 15:33:38 +0200 |
| commit | 6767d05ed8f902ee3fcdc2e42cccb29524cf19e5 (patch) | |
| tree | fb44146fb3f2822f04985893104ca7b6434b9fd0 /arch/arm | |
| parent | eccfe8b75b09225187863ac9520a827b6400a8aa (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
Two bug fixes for the imx multi-platform support.
* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: select HAVE_IMX_SRC when SMP is enabled
ARM: mach-imx: Fix selection of ARCH_MXC
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index bd012441b74..f71302c3ac3 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -17,6 +17,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_MXC=y CONFIG_ARCH_MULTI_V4T=y CONFIG_ARCH_MULTI_V5=y # CONFIG_ARCH_MULTI_V7 is not set diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index a4965f37257..5dfadfbf7c9 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -16,6 +16,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_MXC=y CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_MULTI_V7=y CONFIG_MACH_MX31LILLY=y diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 892631f1e4c..f1bf610e290 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -1,5 +1,5 @@ config ARCH_MXC - def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 + bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 select ARCH_REQUIRE_GPIOLIB select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR if !ZBOOT_ROM @@ -72,7 +72,7 @@ config HAVE_IMX_MMDC bool config HAVE_IMX_SRC - bool + def_bool y if SMP config IMX_HAVE_IOMUX_V1 bool @@ -837,7 +837,6 @@ config SOC_IMX6Q select HAVE_CAN_FLEXCAN if CAN select HAVE_IMX_GPC select HAVE_IMX_MMDC - select HAVE_IMX_SRC select HAVE_SMP select MFD_SYSCON select PINCTRL |