From 38e9b3a6c7c3eaa7f0131fd95a9cfc1255bdae45 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 2 Mar 2012 21:51:38 +0000 Subject: [PATCH] --- yaml --- r: 296699 b: refs/heads/master c: e27fc6cf84a401e62144a522695f114c9bdbebb7 h: refs/heads/master i: 296697: 45d3cefa029a7ea762fc5cd679efe6615ce05fe4 296695: 7ccd3258857837d63d25e0171a35ec799cdb839a v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/u8500_defconfig | 1 + trunk/arch/arm/mach-ux500/Kconfig | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e4951941ad6..94b490df993e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab2f75ce55ef6f903348026271e30796f016851f +refs/heads/master: e27fc6cf84a401e62144a522695f114c9bdbebb7 diff --git a/trunk/arch/arm/configs/u8500_defconfig b/trunk/arch/arm/configs/u8500_defconfig index 2d7b6e7b7271..889d73ac1ae1 100644 --- a/trunk/arch/arm/configs/u8500_defconfig +++ b/trunk/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/trunk/arch/arm/mach-ux500/Kconfig b/trunk/arch/arm/mach-ux500/Kconfig index 5cfa5390e0fd..afb3706bab2a 100644 --- a/trunk/arch/arm/mach-ux500/Kconfig +++ b/trunk/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