From a19c3b4cf7597529b5213279c186ab85ca2113e3 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sat, 15 Dec 2012 12:02:11 +0900 Subject: ARM: mach-shmobile: mackerel: update defconfig * Enable ARM_APPENDED_DTB Typically the bootloader of a mackerel board does not support DT so this option is useful * Add "rw" to command line This appears to be necessary for a successful NFS-root boot * Remove memchunk from kernel command line, it is not used outside of arch/sh * Move command line to dts This brings us one small step closer to sharing defconfig between mackerel and other boards Signed-off-by: Simon Horman --- arch/arm/configs/mackerel_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs/mackerel_defconfig') diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 2098ce15554..e6881accf96 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig @@ -23,7 +23,7 @@ CONFIG_AEABI=y CONFIG_FORCE_MAX_ZONEORDER=15 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" +CONFIG_ARM_APPENDED_DTB=y CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM=y -- cgit v1.2.3