aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/holly.dts
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2007-06-13 14:53:00 +1000
committerPaul Mackerras <paulus@samba.org>2007-06-14 22:30:17 +1000
commite60c526fba3ba77070d0c97fac52c86243ad694d (patch)
tree8ed711751ddcee7fa3bbd46de3b31876fe53f806 /arch/powerpc/boot/dts/holly.dts
parent85aecac8d2893372c618bac373e2de9cf102dfbc (diff)
downloadkernel_samsung_smdk4412-e60c526fba3ba77070d0c97fac52c86243ad694d.zip
kernel_samsung_smdk4412-e60c526fba3ba77070d0c97fac52c86243ad694d.tar.gz
kernel_samsung_smdk4412-e60c526fba3ba77070d0c97fac52c86243ad694d.tar.bz2
[POWERPC] Don't store a command line in the Holly device tree
Currently, the Holly device tree includes a bootargs property in /chosen, which gives a commandline. This is somewhat inconvenient, because it means an alternative default command line can't be given in the kernel config - the value obtained from the dts via the bootwrapper will always override CONFIG_CMDLINE. This removes the command line from the dts, and instead puts the same command line as a default in holly_defconfig. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/dts/holly.dts')
-rw-r--r--arch/powerpc/boot/dts/holly.dts1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index 254499b..e6b5091 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -193,6 +193,5 @@
chosen {
linux,stdout-path = "/tsi109@c0000000/serial@7808";
- bootargs = "console=ttyS0,115200";
};
};