summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2012-12-15 12:02:11 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-01-11 12:39:43 +0900
commita19c3b4cf7597529b5213279c186ab85ca2113e3 (patch)
tree2b1f26d0087cc7c4abfd3ff7e94dce63e725c3bc /arch/arm/boot
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
downloadop-kernel-dev-a19c3b4cf7597529b5213279c186ab85ca2113e3.zip
op-kernel-dev-a19c3b4cf7597529b5213279c186ab85ca2113e3.tar.gz
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/boot')
-rw-r--r--arch/arm/boot/dts/sh7372-mackerel.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts
index 286f0ca..2623de8 100644
--- a/arch/arm/boot/dts/sh7372-mackerel.dts
+++ b/arch/arm/boot/dts/sh7372-mackerel.dts
@@ -15,6 +15,10 @@
model = "Mackerel (AP4 EVM 2nd)";
compatible = "renesas,mackerel";
+ chosen {
+ bootargs = "console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw";
+ };
+
memory {
device_type = "memory";
reg = <0x40000000 0x10000000>;
OpenPOWER on IntegriCloud