From: David Gibson <david@gibson.dropbear.id.au>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH 12/13] Don't store a command line in the Holly device tree
Date: Wed, 13 Jun 2007 14:53:00 +1000 (EST) [thread overview]
Message-ID: <20070613045300.C2FC9DDF12@ozlabs.org> (raw)
In-Reply-To: <20070613045031.GD16148@localhost.localdomain>
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>
---
arch/powerpc/boot/dts/holly.dts | 1 -
arch/powerpc/configs/holly_defconfig | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
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
next prev parent reply other threads:[~2007-06-13 4:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-13 4:50 [0/13] Queued patches for 2.6.13 David Gibson
2007-06-13 4:52 ` [PATCH 1/13] Split low-level OF-related bootloader code into separate files David Gibson
2007-06-13 4:52 ` [PATCH 2/13] Split out asm-ppc/mmu.h portions for the "classic" hash-based MMU David Gibson
2007-06-13 4:52 ` [PATCH 3/13] Abolish iopa(), mm_ptov(), io_block_mapping() from arch/powerpc David Gibson
2007-06-16 0:55 ` Benjamin Herrenschmidt
2007-06-13 4:52 ` [PATCH 4/13] Remove the dregs of APUS support " David Gibson
2007-06-13 4:52 ` [PATCH 7/13] Kill typedef-ed structs for hash PTEs and BATs David Gibson
2007-06-13 4:52 ` [PATCH 5/13] Remove a couple of unused definitions from pgtable_32.c David Gibson
2007-06-14 21:04 ` Kumar Gala
2007-06-14 21:50 ` Andy Fleming
2007-06-15 15:40 ` Kumar Gala
2007-06-13 4:52 ` [PATCH 6/13] Start factoring pgtable-ppc32.h and pgtable-ppc64.h David Gibson
2007-06-14 14:05 ` Segher Boessenkool
2007-06-13 4:52 ` [PATCH 8/13] Merge CPU features pertaining to icache coherency David Gibson
2007-06-13 4:52 ` [PATCH 9/13] Factor zImage's 44x reset code out of ebony.c David Gibson
2007-06-13 4:52 ` [PATCH 10/13] Derive ebc ranges property from EBC registers David Gibson
2007-06-14 14:12 ` Segher Boessenkool
2007-06-14 14:14 ` Segher Boessenkool
2007-06-13 4:53 ` [PATCH 11/13] Consolidate cuboot initialization code David Gibson
2007-06-13 4:53 ` [PATCH 13/13] Fix problems with device tree representation of TSI-1xx bridges David Gibson
2007-06-14 14:24 ` Segher Boessenkool
2007-06-13 4:53 ` David Gibson [this message]
2007-06-13 5:10 ` [0/13] Queued patches for 2.6.13 Segher Boessenkool
2007-06-13 6:09 ` [0/13] Queued patches for 2.6.23 David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070613045300.C2FC9DDF12@ozlabs.org \
--to=david@gibson.dropbear.id.au \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).