aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-05-04 09:42:41 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-05-12 01:32:17 -0400
commit6c4d4efb9d19017f0eef3893912f3dec513ef8e9 (patch)
treef395e30e79b1f367f249054ccfcce81de01f58f0 /arch
parent2954ff395bcf69cb31dbe500bec20ce0944ea19e (diff)
ARM: mxs: always build in device tree support
As the ultimate for mxs platform is to convert over to device tree, let's start always building in device tree support for the platform. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/configs/mxs_defconfig1
-rw-r--r--arch/arm/mach-mxs/Kconfig1
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ae5c251cd251..1f1a4fa6db58 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -471,6 +471,7 @@ config ARCH_MXS
471 select COMMON_CLK 471 select COMMON_CLK
472 select HAVE_CLK_PREPARE 472 select HAVE_CLK_PREPARE
473 select PINCTRL 473 select PINCTRL
474 select USE_OF
474 help 475 help
475 Support for Freescale MXS-based family of processors 476 Support for Freescale MXS-based family of processors
476 477
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 1ebbf451c48d..5406c23a02e3 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -22,6 +22,7 @@ CONFIG_BLK_DEV_INTEGRITY=y
22# CONFIG_IOSCHED_DEADLINE is not set 22# CONFIG_IOSCHED_DEADLINE is not set
23# CONFIG_IOSCHED_CFQ is not set 23# CONFIG_IOSCHED_CFQ is not set
24CONFIG_ARCH_MXS=y 24CONFIG_ARCH_MXS=y
25CONFIG_MACH_MXS_DT=y
25CONFIG_MACH_MX23EVK=y 26CONFIG_MACH_MX23EVK=y
26CONFIG_MACH_MX28EVK=y 27CONFIG_MACH_MX28EVK=y
27CONFIG_MACH_STMP378X_DEVB=y 28CONFIG_MACH_STMP378X_DEVB=y
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 8138a13e23cf..91cf0625819c 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -25,7 +25,6 @@ config MACH_MXS_DT
25 bool "Support MXS platforms from device tree" 25 bool "Support MXS platforms from device tree"
26 select SOC_IMX23 26 select SOC_IMX23
27 select SOC_IMX28 27 select SOC_IMX28
28 select USE_OF
29 help 28 help
30 Include support for Freescale MXS platforms(i.MX23 and i.MX28) 29 Include support for Freescale MXS platforms(i.MX23 and i.MX28)
31 using the device tree for discovery 30 using the device tree for discovery