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

Commit d696e3f6 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: enable multiplatform build 



Remove files that are not needed by multiplatform build, and make
necessary changes on Kconfig to enable multiplatform build.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent e91411b4

arch/arm/Kconfig

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

	  Support for systems based on the DC21285 companion chip

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

	  ("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

config ARCH_NETX

	bool "Hilscher NetX based"

	bool "Hilscher NetX based"

	select ARM_VIC

	select ARM_VIC

arch/arm/configs/mxs_defconfig

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

CONFIG_BLK_DEV_INTEGRITY=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MXS=y

CONFIG_ARCH_MXS=y

CONFIG_MACH_MXS_DT=y

# CONFIG_ARM_THUMB is not set

# CONFIG_ARM_THUMB is not set

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

CONFIG_AEABI=y

arch/arm/mach-mxs/Kconfig

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



config SOC_IMX23

config SOC_IMX23

	bool

	bool

	select ARM_AMBA

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

	select HAVE_PWM

	select PINCTRL_IMX28

	select PINCTRL_IMX28





comment "MXS platforms:"

config ARCH_MXS



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

config MACH_MXS_DT

	depends on ARCH_MULTI_V5

	bool "Support MXS platforms from device tree"

	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_IMX23

	select SOC_IMX28

	select SOC_IMX28

	select STMP_DEVICE

	help

	help

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

	  Support for Freescale MXS-based family of processors
 
	  using the device tree for discovery



endif

arch/arm/mach-mxs/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_PM) += pm.o

obj-$(CONFIG_PM) += pm.o

obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o
 
obj-$(CONFIG_ARCH_MXS) += mach-mxs.o

arch/arm/mach-mxs/Makefile.boot

deleted100644 → 0
+0 −1
Original line number Original line Diff line number Diff line 
zreladdr-y += 0x40008000