From: Simon Horman Date: Wed, 24 Jul 2013 08:36:29 +0000 (+0900) Subject: ARM: shmobile: marzen: Enable ARM_APPENDED_DTB in defconfig X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c167a825d56e9946bb54d91017a53efb04ffdaf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Signed-off-by: Simon Horman --- diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 494e70aeb9e1..82e4040b4c17 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -29,6 +29,7 @@ CONFIG_AEABI=y 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