Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6767d05e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/multi-platform' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents eccfe8b7 68b25325

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-imx/Kconfig

+2 −3
Original line number Diff line number Diff line 
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