diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2012-12-15 04:02:11 +0100 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-11 04:39:43 +0100 |
commit | a19c3b4cf7597529b5213279c186ab85ca2113e3 (patch) | |
tree | 2b1f26d0087cc7c4abfd3ff7e94dce63e725c3bc /arch/arm/configs | |
parent | Linux 3.8-rc1 (diff) | |
download | linux-a19c3b4cf7597529b5213279c186ab85ca2113e3.tar.xz linux-a19c3b4cf7597529b5213279c186ab85ca2113e3.zip |
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 <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/mackerel_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 2098ce155542..e6881accf96a 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 |