summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2011-12-01 10:21:16 +0100
committerTony Lindgren <tony@atomide.com>2011-12-17 01:17:43 +0100
commit40c0591f0a349ec074357e05c6ab1a3bc951807c (patch)
tree873dcfc4465ef131bbfb72206e5aa396ca06275b /arch
parentarm/dts: OMAP: Remove bootargs node from board files (diff)
downloadlinux-40c0591f0a349ec074357e05c6ab1a3bc951807c.tar.xz
linux-40c0591f0a349ec074357e05c6ab1a3bc951807c.zip
ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems
devicetree will become the mandatory boot method for OMAP2+. In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF, select USE_OF by default for every OMAP2+ systems. Enable PROC_DEVICETREE as well. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/Kconfig1
-rw-r--r--arch/arm/plat-omap/Kconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b6625130831d..bdd5b68fba80 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -111,7 +111,6 @@ comment "OMAP Board Type"
config MACH_OMAP_GENERIC
bool "Generic OMAP2+ board"
depends on ARCH_OMAP2PLUS
- select USE_OF
default y
help
Support for generic TI OMAP2+ boards using Flattened Device Tree.
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index aa59f4247dc5..734009a93857 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -24,6 +24,8 @@ config ARCH_OMAP2PLUS
select CLKDEV_LOOKUP
select GENERIC_IRQ_CHIP
select OMAP_DM_TIMER
+ select USE_OF
+ select PROC_DEVICETREE
help
"Systems based on OMAP2, OMAP3 or OMAP4"