aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/holly_defconfig
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/configs/holly_defconfig
parent85aecac8d2893372c618bac373e2de9cf102dfbc (diff)
[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/configs/holly_defconfig')
-rw-r--r--arch/powerpc/configs/holly_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index be633b9b57c..8ad57b94eab 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -182,7 +182,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_PROC_DEVICETREE=y
-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,115200"
# CONFIG_PM is not set
# CONFIG_SECCOMP is not set
# CONFIG_WANT_DEVICE_TREE is not set