diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-03-02 22:51:38 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 20:46:11 +0100 |
commit | e27fc6cf84a401e62144a522695f114c9bdbebb7 (patch) | |
tree | c54b7e51116e6f5479338f5c8ef0307ba06084f1 | |
parent | Merge branch 'depends/driver-core' into ux500/dt (diff) | |
download | linux-e27fc6cf84a401e62144a522695f114c9bdbebb7.tar.xz linux-e27fc6cf84a401e62144a522695f114c9bdbebb7.zip |
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>
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/Kconfig | 6 |
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 CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y CONFIG_MACH_U5500=y +CONFIG_MACH_UX500_DT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_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 depends on UX500_SOC_DB5500 help Include support for the U5500 development platform. + +config MACH_UX500_DT + bool "Generic U8500 support using device tree" + depends on MACH_U8500 + select USE_OF + endmenu config UX500_DEBUG_UART |