[Gc-linux-cvs] linux/arch/powerpc/boot/dts gamecube.dts, 1.4, 1.5 wii.dts, 1.6, 1.7

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot/dts
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13650/arch/powerpc/boot/dts

Modified Files:
	gamecube.dts wii.dts 
Log Message:
Merged 2.6.25.
Queued small fixes for: 
- starlet-es
- starlet-ipc
- starlet-stm
- rvl-stsd
- rvl-sthcd
- gcn-ai



Index: gamecube.dts
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/gamecube.dts,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gamecube.dts	4 Apr 2008 19:17:50 -0000	1.4
+++ gamecube.dts	13 Sep 2008 19:42:52 -0000	1.5
@@ -19,8 +19,7 @@
 	#size-cells = <1>;
 
 	chosen {
-		//bootargs = "root=/dev/ram0 video=gcn-vifb:tv=auto ip=on force_keyboard_port=4";
-		bootargs = "root=/dev/nfs nfsroot=192.168.001.253:/nfsroot/cube video=gcn-vifb:tv=auto ip=192.168.001.047:192.168.001.253:192.168.001.251 force_keyboard_port=4";
+		bootargs = "root=/dev/ram0 video=gcn-vifb:tv=auto ip=on force_keyboard_port=4";
 		linux,crashkernel-base = <0>;
 		linux,crashkernel-size = <0>;
 		linux,stdout-path = "/exi@0c006800/usbgecko@0c006814";

Index: wii.dts
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/wii.dts,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wii.dts	2 Jul 2008 20:36:22 -0000	1.6
+++ wii.dts	13 Sep 2008 19:42:52 -0000	1.7
@@ -21,19 +21,20 @@
 	chosen {
 
 /*
- * ramdisk command-line example
- */
-/*		bootargs = "root=/dev/ram0 video=gcnfb:tv=NTSC ip=on force_keyboard_port=4"; */
 
-/*
- * nfsroot command-line example
- */
-/*		bootargs = "root=/dev/nfs nfsroot=192.168.001.253:/nfsroot/cube.etch ip=on video=gcnfb:tv=NTSC force_keyboard_port=4"; */
+1. ramdisk command-line example
+bootargs = "root=/dev/ram0 video=gcnfb:tv=NTSC ip=on force_keyboard_port=4";
+
+2. nfsroot command-line example
+bootargs = "root=/dev/nfs nfsroot=192.168.001.253:/nfsroot/cube ip=on video=gcnfb:tv=NTSC force_keyboard_port=4";
+
+3. root filesystem on second partition of front SD card example
+bootargs = "root=/dev/rvlsda2 video=gcnfb:tv=NTSC force_keyboard_port=4 placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers";
+
+*/
 
-/*
- * root filesystem on second partition of front SD card example
- */
 		bootargs = "root=/dev/rvlsda2 video=gcnfb:tv=NTSC force_keyboard_port=4 placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers";
+
 		linux,crashkernel-base = <0>;
 		linux,crashkernel-size = <0>;
 		linux,stdout-path = "/exi@0d006800/usbgecko@0d006814";