tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Arnd Bergmann 6767d05e eccfe8b7

+4 -3
+1
arch/arm/configs/imx_v4_v5_defconfig
··· 17 17 # CONFIG_BLK_DEV_BSG is not set 18 18 # CONFIG_IOSCHED_DEADLINE is not set 19 19 # CONFIG_IOSCHED_CFQ is not set 20 + CONFIG_ARCH_MXC=y 20 21 CONFIG_ARCH_MULTI_V4T=y 21 22 CONFIG_ARCH_MULTI_V5=y 22 23 # CONFIG_ARCH_MULTI_V7 is not set
+1
arch/arm/configs/imx_v6_v7_defconfig
··· 16 16 CONFIG_MODVERSIONS=y 17 17 CONFIG_MODULE_SRCVERSION_ALL=y 18 18 # CONFIG_BLK_DEV_BSG is not set 19 + CONFIG_ARCH_MXC=y 19 20 CONFIG_ARCH_MULTI_V6=y 20 21 CONFIG_ARCH_MULTI_V7=y 21 22 CONFIG_MACH_MX31LILLY=y
+2 -3
arch/arm/mach-imx/Kconfig
··· 1 1 config ARCH_MXC 2 - def_bool y if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 2 + bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 3 3 select ARCH_REQUIRE_GPIOLIB 4 4 select ARM_PATCH_PHYS_VIRT 5 5 select AUTO_ZRELADDR if !ZBOOT_ROM ··· 72 72 bool 73 73 74 74 config HAVE_IMX_SRC 75 - bool 75 + def_bool y if SMP 76 76 77 77 config IMX_HAVE_IOMUX_V1 78 78 bool ··· 837 837 select HAVE_CAN_FLEXCAN if CAN 838 838 select HAVE_IMX_GPC 839 839 select HAVE_IMX_MMDC 840 - select HAVE_IMX_SRC 841 840 select HAVE_SMP 842 841 select MFD_SYSCON 843 842 select PINCTRL