aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-03-02 16:51:38 -0500
committerArnd Bergmann <arnd@arndb.de>2012-03-16 15:46:11 -0400
commite27fc6cf84a401e62144a522695f114c9bdbebb7 (patch)
treec54b7e51116e6f5479338f5c8ef0307ba06084f1 /arch/arm
parentab2f75ce55ef6f903348026271e30796f016851f (diff)
ARM: ux500: CONFIG: Enable Device Tree support for future endeavours
Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/u8500_defconfig1
-rw-r--r--arch/arm/mach-ux500/Kconfig6
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 2d7b6e7b7271..889d73ac1ae1 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -13,6 +13,7 @@ CONFIG_UX500_SOC_DB8500=y
13CONFIG_MACH_HREFV60=y 13CONFIG_MACH_HREFV60=y
14CONFIG_MACH_SNOWBALL=y 14CONFIG_MACH_SNOWBALL=y
15CONFIG_MACH_U5500=y 15CONFIG_MACH_U5500=y
16CONFIG_MACH_UX500_DT=y
16CONFIG_NO_HZ=y 17CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y 18CONFIG_HIGH_RES_TIMERS=y
18CONFIG_SMP=y 19CONFIG_SMP=y
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 5cfa5390e0fd..afb3706bab2a 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -50,6 +50,12 @@ config MACH_U5500
50 depends on UX500_SOC_DB5500 50 depends on UX500_SOC_DB5500
51 help 51 help
52 Include support for the U5500 development platform. 52 Include support for the U5500 development platform.
53
54config MACH_UX500_DT
55 bool "Generic U8500 support using device tree"
56 depends on MACH_U8500
57 select USE_OF
58
53endmenu 59endmenu
54 60
55config UX500_DEBUG_UART 61config UX500_DEBUG_UART