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

Commit d93bea00 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mxs-multiplatform-3.10' of... 

Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/multiplatform

From Shawn Guo <shawn.guo@linaro.org>:

The mxs multiplatform support for 3.10:

* It enables the multiplatform build for mach-mxs platform.

* tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: mxs: enable multiplatform build
  ARM: mxs: rename debug-macro.S for multiplatform build
  ARM: mxs: call mxs_pm_init() as a machine_desc hook

Conflicts:
	arch/arm/Kconfig.debug

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 71f64240 d696e3f6

arch/arm/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -422,23 +422,6 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_MXS

	bool "Freescale MXS-based"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK_PREPARE

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select SPARSE_IRQ

	select STMP_DEVICE

	select USE_OF

	help

	  Support for Freescale MXS-based family of processors



config ARCH_NETX

	bool "Hilscher NetX based"

	select ARM_VIC

arch/arm/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6Q_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART

	default "debug/nomadik.S" if DEBUG_NOMADIK_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

arch/arm/configs/mxs_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ CONFIG_MODVERSIONS=y 
CONFIG_BLK_DEV_INTEGRITY=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MXS=y

CONFIG_MACH_MXS_DT=y

# CONFIG_ARM_THUMB is not set

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

arch/arm/mach-mxs/Kconfig

+12 −10
Original line number Diff line number Diff line 
if ARCH_MXS



config SOC_IMX23

	bool

	select ARM_AMBA
@@ -15,14 +13,18 @@ config SOC_IMX28 
	select HAVE_PWM

	select PINCTRL_IMX28



comment "MXS platforms:"



config MACH_MXS_DT

	bool "Support MXS platforms from device tree"

config ARCH_MXS

	bool "Freescale MXS (i.MX23, i.MX28) support"

	depends on ARCH_MULTI_V5

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK_PREPARE

	select PINCTRL

	select SOC_IMX23

	select SOC_IMX28

	select STMP_DEVICE

	help

	  Include support for Freescale MXS platforms(i.MX23 and i.MX28)

	  using the device tree for discovery



endif
 
	  Support for Freescale MXS-based family of processors