summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-07-01 09:13:13 -0400
committerTony Lindgren <tony@atomide.com>2013-07-04 05:11:57 -0700
commitc24a6ae18abde53b048372b066b93b71b1b91154 (patch)
treecbbeb9643e46305b821338093f6f9eb08d1ac368 /arch/arm
parentfb15bdfbd76dae771069d2a93ebe4bbf84f361d0 (diff)
downloadlinux-stable-c24a6ae18abde53b048372b066b93b71b1b91154.tar.gz
linux-stable-c24a6ae18abde53b048372b066b93b71b1b91154.tar.bz2
linux-stable-c24a6ae18abde53b048372b066b93b71b1b91154.zip
ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
As this config must support boards which cannot support separate device trees, enable support for appended ones. Cc: Tony Lindgren <tony@atomide.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Tom Rini <trini@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/omap2plus_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 009fa6944687..a58d57017fed 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -34,6 +34,8 @@ CONFIG_NR_CPUS=2
CONFIG_LEDS=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
CONFIG_KEXEC=y
CONFIG_FPE_NWFPE=y