commit 8c167a825d56e9946bb54d91017a53efb04ffdaf
author Simon Horman <horms+renesas@verge.net.au> Wed Jul 24 17:36:29 2013 +0900
committer Simon Horman <horms+renesas@verge.net.au> Tue Jul 30 13:28:55 2013 +0900
tree e5443dba8757f0b5a9d9b6137bc50b72f63222b5
parent ad81f0545ef01ea651886dddac4bef6cec930092

ARM: shmobile: marzen: Enable ARM_APPENDED_DTB in defconfig

"ARM: shmobile: marzen: Switch to DT_MACHINE_START" moves marzen
over to use DT_MACHINE_START, however, the prevalent boot loader
does not support booting with a separate dtb. Thus, it makes
sense to use ARM_APPENDED_DTB by default.

This is consistent with other shmobile defconfigs.

Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

arch/arm/configs/marzen_defconfig

diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 494e70a..82e4040 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -29,6 +29,7 @@
 CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
 CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y