* Don't store a command line in the Holly device tree
@ 2007-05-24 4:02 David Gibson
2007-05-24 13:39 ` Josh Boyer
0 siblings, 1 reply; 2+ messages in thread
From: David Gibson @ 2007-05-24 4:02 UTC (permalink / raw)
To: Josh Boyer; +Cc: Hugh Blemings, Paul Mackerras, linuxppc-dev
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 patch 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>
Index: working-2.6/arch/powerpc/boot/dts/holly.dts
===================================================================
--- working-2.6.orig/arch/powerpc/boot/dts/holly.dts 2007-05-08 14:58:06.000000000 +1000
+++ working-2.6/arch/powerpc/boot/dts/holly.dts 2007-05-24 13:55:38.000000000 +1000
@@ -193,6 +193,5 @@
chosen {
linux,stdout-path = "/tsi109@c0000000/serial@7808";
- bootargs = "console=ttyS0,115200";
};
};
Index: working-2.6/arch/powerpc/configs/holly_defconfig
===================================================================
--- working-2.6.orig/arch/powerpc/configs/holly_defconfig 2007-05-24 13:55:53.000000000 +1000
+++ working-2.6/arch/powerpc/configs/holly_defconfig 2007-05-24 13:56:16.000000000 +1000
@@ -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
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: Don't store a command line in the Holly device tree
2007-05-24 4:02 Don't store a command line in the Holly device tree David Gibson
@ 2007-05-24 13:39 ` Josh Boyer
0 siblings, 0 replies; 2+ messages in thread
From: Josh Boyer @ 2007-05-24 13:39 UTC (permalink / raw)
To: David Gibson; +Cc: Hugh Blemings, Paul Mackerras, linuxppc-dev
On Thu, 2007-05-24 at 14:02 +1000, David Gibson wrote:
> 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 patch 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>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-05-24 13:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-24 4:02 Don't store a command line in the Holly device tree David Gibson
2007-05-24 13:39 ` Josh Boyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).