diff -Nru linux/arch/mips/Kconfig.orig linux/arch/mips/Kconfig
--- linux/arch/mips/Kconfig.orig	Mon Jan 19 11:00:08 2004
+++ linux/arch/mips/Kconfig	Tue Jan 20 10:52:47 2004
@@ -1448,6 +1448,16 @@
 	  Say Y here if you are compiling the kernel on a different
 	  architecture than the one it is intended to run on.
 
+config CMDLINE
+	string "Default kernel command string"
+	default ""
+	help
+          On some platforms, there is currently no way for the boot loader to
+          pass arguments to the kernel. For these platforms, you can supply
+          some command-line options at build time by entering them here.  In
+          other cases you can specify kernel args so that you don't have
+	  to set them up in board prom initialization routines.
+
 config DEBUG_KERNEL
 	bool "Kernel debugging"
 
diff -Nru linux/arch/mips/arc/cmdline.c.orig linux/arch/mips/arc/cmdline.c
--- linux/arch/mips/arc/cmdline.c.orig	Mon Jun 23 15:25:05 2003
+++ linux/arch/mips/arc/cmdline.c	Tue Jan 20 11:31:56 2004
@@ -16,8 +16,6 @@
 
 #undef DEBUG_CMDLINE
 
-char arcs_cmdline[CL_SIZE];
-
 char * __init prom_getcmdline(void)
 {
 	return arcs_cmdline;
diff -Nru linux/arch/mips/au1000/common/prom.c.orig linux/arch/mips/au1000/common/prom.c
--- linux/arch/mips/au1000/common/prom.c.orig	Wed Nov  5 14:29:18 2003
+++ linux/arch/mips/au1000/common/prom.c	Tue Jan 20 11:31:32 2004
@@ -44,7 +44,6 @@
 
 /* #define DEBUG_CMDLINE */
 
-char arcs_cmdline[CL_SIZE];
 extern int prom_argc;
 extern char **prom_argv, **prom_envp;
 
diff -Nru linux/arch/mips/baget/prom/init.c.orig linux/arch/mips/baget/prom/init.c
--- linux/arch/mips/baget/prom/init.c.orig	Tue Nov 18 10:01:22 2003
+++ linux/arch/mips/baget/prom/init.c	Tue Jan 20 11:31:15 2004
@@ -7,8 +7,6 @@
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	/* Should probably return one of "BT23-201", "BT23-202" */
diff -Nru linux/arch/mips/cobalt/setup.c.orig linux/arch/mips/cobalt/setup.c
--- linux/arch/mips/cobalt/setup.c.orig	Mon Jan  5 10:33:34 2004
+++ linux/arch/mips/cobalt/setup.c	Tue Jan 20 11:30:09 2004
@@ -31,7 +31,7 @@
 
 int cobalt_board_id;
 
-char arcs_cmdline[CL_SIZE] = {
+static char my_cmdline[CL_SIZE] = {
  "console=ttyS0,115200 "
 #ifdef CONFIG_IP_PNP
  "ip=on "
@@ -137,6 +137,8 @@
 {
 	int argc = fw_arg0;
 
+	strcpy(arcs_cmdline, my_cmdline);
+
 	mips_machgroup = MACH_GROUP_COBALT;
 
 	add_memory_region(0x0, argc & 0x7fffffff, BOOT_MEM_RAM);
diff -Nru linux/arch/mips/ddb5xxx/common/prom.c.orig linux/arch/mips/ddb5xxx/common/prom.c
--- linux/arch/mips/ddb5xxx/common/prom.c.orig	Fri Jan  9 15:42:36 2004
+++ linux/arch/mips/ddb5xxx/common/prom.c	Tue Jan 20 11:26:07 2004
@@ -18,8 +18,6 @@
 #include <asm/ddb5xxx/ddb5xxx.h>
 #include <asm/debug.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	switch (mips_machtype) {
@@ -43,8 +41,11 @@
 	char **arg = (char**) fw_arg1;
 	int i;
 
+	/* if user passes kernel args, ignore the default one */
+	if (argc > 1)
+		arcs_cmdline[0] = '\0';
+
 	/* arg[0] is "g", the rest is boot parameters */
-	arcs_cmdline[0] = '\0';
 	for (i = 1; i < argc; i++) {
 		if (strlen(arcs_cmdline) + strlen(arg[i] + 1)
 		    >= sizeof(arcs_cmdline))
@@ -53,9 +54,6 @@
 		strcat(arcs_cmdline, " ");
 	}
 
-	/* by default all these boards use dhcp/nfs root fs */
-	strcat(arcs_cmdline, "ip=bootp");
-
 	mips_machgroup = MACH_GROUP_NEC_DDB;
 
 #if defined(CONFIG_DDB5074)
diff -Nru linux/arch/mips/dec/prom/cmdline.c.orig linux/arch/mips/dec/prom/cmdline.c
--- linux/arch/mips/dec/prom/cmdline.c.orig	Tue Oct  1 08:03:26 2002
+++ linux/arch/mips/dec/prom/cmdline.c	Tue Jan 20 11:23:45 2004
@@ -13,8 +13,6 @@
 
 #undef PROM_DEBUG
 
-char arcs_cmdline[CL_SIZE];
-
 void __init prom_init_cmdline(s32 argc, s32 *argv, u32 magic)
 {
 	char *arg;
diff -Nru linux/arch/mips/galileo-boards/ev96100/init.c.orig linux/arch/mips/galileo-boards/ev96100/init.c
--- linux/arch/mips/galileo-boards/ev96100/init.c.orig	Tue Nov 18 10:01:22 2003
+++ linux/arch/mips/galileo-boards/ev96100/init.c	Tue Jan 20 11:23:32 2004
@@ -50,7 +50,6 @@
 
 int prom_argc;
 char **prom_argv, **prom_envp;
-char arcs_cmdline[CL_SIZE];
 
 int init_debug = 0;
 
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/prom.c.orig linux/arch/mips/gt64120/momenco_ocelot/prom.c
--- linux/arch/mips/gt64120/momenco_ocelot/prom.c.orig	Tue Nov 18 10:01:23 2003
+++ linux/arch/mips/gt64120/momenco_ocelot/prom.c	Tue Jan 20 11:23:19 2004
@@ -27,7 +27,6 @@
 };
 
 struct callvectors* debug_vectors;
-char arcs_cmdline[CL_SIZE];
 
 extern unsigned long gt64120_base;
 
diff -Nru linux/arch/mips/gt64120/ev64120/setup.c.orig linux/arch/mips/gt64120/ev64120/setup.c
--- linux/arch/mips/gt64120/ev64120/setup.c.orig	Tue Nov 18 10:01:23 2003
+++ linux/arch/mips/gt64120/ev64120/setup.c	Tue Jan 20 11:23:05 2004
@@ -59,12 +59,6 @@
  */
 extern struct pci_ops galileo_pci_ops;
 
-char arcs_cmdline[CL_SIZE] = {
-	"console=ttyS0,115200 "
-	"root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal "
-	"ip=192.168.1.211:192.168.1.1:::gt::"
-};
-
 unsigned long __init prom_free_prom_memory(void)
 {
 	return 0;
diff -Nru linux/arch/mips/hp-lj/init.c.orig linux/arch/mips/hp-lj/init.c
--- linux/arch/mips/hp-lj/init.c.orig	Tue Nov 18 10:01:23 2003
+++ linux/arch/mips/hp-lj/init.c	Tue Jan 20 11:20:13 2004
@@ -17,8 +17,6 @@
 const char CommandLine[] = Delimiter
   "root=/dev/hda3                                                                                                                                                                                                                                            ";
 
-char arcs_cmdline[CL_SIZE];
-
 void __init prom_init(void)
 {
 	ulong mem_size = get_mem_avail();
diff -Nru linux/arch/mips/ite-boards/generic/pmon_prom.c.orig linux/arch/mips/ite-boards/generic/pmon_prom.c
--- linux/arch/mips/ite-boards/generic/pmon_prom.c.orig	Wed Nov  5 14:29:21 2003
+++ linux/arch/mips/ite-boards/generic/pmon_prom.c	Tue Jan 20 11:19:36 2004
@@ -42,9 +42,6 @@
 
 #include <asm/bootinfo.h>
 
-/* #define DEBUG_CMDLINE */
-
-char arcs_cmdline[CL_SIZE];
 extern int prom_argc;
 extern char **prom_argv, **prom_envp;
 
diff -Nru linux/arch/mips/jmr3927/common/prom.c.orig linux/arch/mips/jmr3927/common/prom.c
--- linux/arch/mips/jmr3927/common/prom.c.orig	Wed Nov  5 14:29:21 2003
+++ linux/arch/mips/jmr3927/common/prom.c	Tue Jan 20 11:19:14 2004
@@ -41,9 +41,6 @@
 
 #include <asm/bootinfo.h>
 
-/* #define DEBUG_CMDLINE */
-
-char arcs_cmdline[CL_SIZE];
 extern int prom_argc;
 extern char **prom_argv, **prom_envp;
 
diff -Nru linux/arch/mips/kernel/setup.c.orig linux/arch/mips/kernel/setup.c
--- linux/arch/mips/kernel/setup.c.orig	Mon Jan 19 10:59:06 2004
+++ linux/arch/mips/kernel/setup.c	Tue Jan 20 10:53:04 2004
@@ -69,7 +69,7 @@
 
 static char command_line[CL_SIZE];
        char saved_command_line[CL_SIZE];
-extern char arcs_cmdline[CL_SIZE];
+       char arcs_cmdline[CL_SIZE]=CONFIG_CMDLINE;
 
 /*
  * mips_io_port_base is the begin of the address space to which x86 style
diff -Nru linux/arch/mips/lasat/setup.c.orig linux/arch/mips/lasat/setup.c
--- linux/arch/mips/lasat/setup.c.orig	Tue Nov 18 10:01:25 2003
+++ linux/arch/mips/lasat/setup.c	Tue Jan 20 11:18:23 2004
@@ -54,8 +54,6 @@
 int lasat_command_line = 0;
 void lasatint_init(void);
 
-extern char arcs_cmdline[CL_SIZE];
-
 extern void lasat_reboot_setup(void);
 extern void pcisetup(void);
 extern void edhac_init(void *, void *, void *);
diff -Nru linux/arch/mips/lasat/prom.c.orig linux/arch/mips/lasat/prom.c
--- linux/arch/mips/lasat/prom.c.orig	Tue Nov 18 10:01:25 2003
+++ linux/arch/mips/lasat/prom.c	Tue Jan 20 11:18:43 2004
@@ -84,8 +84,6 @@
 	prom_printf("prom vectors set up\n");
 }
 
-char arcs_cmdline[CL_SIZE];
-
 static struct at93c_defs at93c_defs[N_MACHTYPES] = {
 	{(void *)AT93C_REG_100, (void *)AT93C_RDATA_REG_100, AT93C_RDATA_SHIFT_100,
 	AT93C_WDATA_SHIFT_100, AT93C_CS_M_100, AT93C_CLK_M_100},
diff -Nru linux/arch/mips/mips-boards/generic/cmdline.c.orig linux/arch/mips/mips-boards/generic/cmdline.c
--- linux/arch/mips/mips-boards/generic/cmdline.c.orig	Tue Nov 18 10:01:25 2003
+++ linux/arch/mips/mips-boards/generic/cmdline.c	Tue Jan 20 11:18:07 2004
@@ -31,8 +31,6 @@
  */
 #define prom_argv(index) ((char *)(long)_prom_argv[(index)])
 
-char arcs_cmdline[CL_SIZE];
-
 char * __init prom_getcmdline(void)
 {
 	return &(arcs_cmdline[0]);
diff -Nru linux/arch/mips/momentum/ocelot_g/prom.c.orig linux/arch/mips/momentum/ocelot_g/prom.c
--- linux/arch/mips/momentum/ocelot_g/prom.c.orig	Tue Nov 18 10:01:25 2003
+++ linux/arch/mips/momentum/ocelot_g/prom.c	Tue Jan 20 11:17:46 2004
@@ -35,7 +35,6 @@
 };
 
 struct callvectors* debug_vectors;
-char arcs_cmdline[CL_SIZE];
 
 extern unsigned long gt64240_base;
 extern unsigned long bus_clock;
diff -Nru linux/arch/mips/momentum/ocelot_c/prom.c.orig linux/arch/mips/momentum/ocelot_c/prom.c
--- linux/arch/mips/momentum/ocelot_c/prom.c.orig	Tue Nov 18 10:01:25 2003
+++ linux/arch/mips/momentum/ocelot_c/prom.c	Tue Jan 20 11:17:34 2004
@@ -38,7 +38,6 @@
 };
 
 struct callvectors* debug_vectors;
-char arcs_cmdline[CL_SIZE];
 
 extern unsigned long mv64340_base;
 extern unsigned long cpu_clock;
diff -Nru linux/arch/mips/momentum/jaguar_atx/prom.c.orig linux/arch/mips/momentum/jaguar_atx/prom.c
--- linux/arch/mips/momentum/jaguar_atx/prom.c.orig	Tue Nov 18 10:01:25 2003
+++ linux/arch/mips/momentum/jaguar_atx/prom.c	Tue Jan 20 11:17:16 2004
@@ -39,7 +39,6 @@
 };
 
 struct callvectors* debug_vectors;
-char arcs_cmdline[CL_SIZE];
 
 extern unsigned long mv64340_base;
 extern unsigned long cpu_clock;
diff -Nru linux/arch/mips/sibyte/cfe/setup.c.orig linux/arch/mips/sibyte/cfe/setup.c
--- linux/arch/mips/sibyte/cfe/setup.c.orig	Mon Jan  5 10:33:36 2004
+++ linux/arch/mips/sibyte/cfe/setup.c	Tue Jan 20 11:16:35 2004
@@ -51,11 +51,6 @@
 phys_t board_mem_region_sizes[SIBYTE_MAX_MEM_REGIONS];
 unsigned int board_mem_region_count;
 
-/* This is the kernel command line.  Actually, it's
-   copied, eventually, to command_line, and looks to be
-   quite redundant.  But not something to fix just now */
-extern char arcs_cmdline[];
-
 int cfe_cons_handle;
 
 #ifdef CONFIG_BLK_DEV_INITRD
diff -Nru linux/arch/mips/sibyte/sb1250/prom.c.orig linux/arch/mips/sibyte/sb1250/prom.c
--- linux/arch/mips/sibyte/sb1250/prom.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/sibyte/sb1250/prom.c	Tue Jan 20 11:15:51 2004
@@ -27,8 +27,6 @@
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 
-extern char arcs_cmdline[];
-
 #ifdef CONFIG_EMBEDDED_RAMDISK
 /* These are symbols defined by the ramdisk linker script */
 extern unsigned char __rd_start;
diff -Nru linux/arch/mips/sibyte/swarm/cmdline.c.orig linux/arch/mips/sibyte/swarm/cmdline.c
--- linux/arch/mips/sibyte/swarm/cmdline.c.orig	Mon Aug  5 17:08:57 2002
+++ linux/arch/mips/sibyte/swarm/cmdline.c	Tue Jan 20 11:15:05 2004
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2000, 2001 Broadcom Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-#include <asm/bootinfo.h>
-
-/*
- * The naming of this variable is a remnant of the initial mips port to
- * ARC-firmware based SGI consoles.  We don't really need to do anything for
- * the variable other than provide an instantiation.  Everything about
- * arcs_cmdline seems more than a little bit hackish...
- */
-char arcs_cmdline[CL_SIZE];
diff -Nru linux/arch/mips/sibyte/swarm/Makefile.orig linux/arch/mips/sibyte/swarm/Makefile
--- linux/arch/mips/sibyte/swarm/Makefile.orig	Mon Jun 23 15:25:08 2003
+++ linux/arch/mips/sibyte/swarm/Makefile	Tue Jan 20 11:15:26 2004
@@ -1,3 +1,3 @@
-lib-y				= setup.o cmdline.o rtc_xicor1241.o rtc_m41t81.o
+lib-y				= setup.o rtc_xicor1241.o rtc_m41t81.o
 
 lib-$(CONFIG_KGDB)		+= dbg_io.o
diff -Nru linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c.orig linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
--- linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c	Tue Jan 20 11:13:58 2004
@@ -36,12 +36,6 @@
 #include <asm/cpu.h>
 #include <asm/tx4927/tx4927.h>
 
-#ifndef COMMAND_LINE_SIZE
-#define COMMAND_LINE_SIZE CL_SIZE
-#endif
-
-char arcs_cmdline[COMMAND_LINE_SIZE] = "console=ttyS0,38400 ip=any root=nfs rw";
-
 void __init prom_init_cmdline(void)
 {
 	int argc = (int) fw_arg0;
diff -Nru linux/arch/mips/vr4181/osprey/prom.c.orig linux/arch/mips/vr4181/osprey/prom.c
--- linux/arch/mips/vr4181/osprey/prom.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/vr4181/osprey/prom.c	Tue Jan 20 11:01:51 2004
@@ -19,8 +19,6 @@
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "NEC_Vr41xx Osprey";
@@ -32,8 +30,9 @@
  */
 void __init prom_init(void)
 {
-	strcpy(arcs_cmdline, "ip=bootp ");
-	strcat(arcs_cmdline, "ether=46,0x03fe0300,eth0 ");
+	// cmdline is now set in default config
+	// strcpy(arcs_cmdline, "ip=bootp ");
+	// strcat(arcs_cmdline, "ether=46,0x03fe0300,eth0 ");
 	// strcpy(arcs_cmdline, "ether=0,0x0300,eth0 "
 	// strcat(arcs_cmdline, "video=vr4181fb:xres:240,yres:320,bpp:8 ");
 
diff -Nru linux/arch/mips/vr41xx/casio-e55/init.c.orig linux/arch/mips/vr41xx/casio-e55/init.c
--- linux/arch/mips/vr41xx/casio-e55/init.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/vr41xx/casio-e55/init.c	Tue Jan 20 10:55:43 2004
@@ -19,8 +19,6 @@
 
 #include <asm/bootinfo.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "CASIO CASSIOPEIA E-11/15/55/65";
diff -Nru linux/arch/mips/vr41xx/ibm-workpad/init.c.orig linux/arch/mips/vr41xx/ibm-workpad/init.c
--- linux/arch/mips/vr41xx/ibm-workpad/init.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/vr41xx/ibm-workpad/init.c	Tue Jan 20 10:58:26 2004
@@ -19,8 +19,6 @@
 
 #include <asm/bootinfo.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "IBM WorkPad z50";
diff -Nru linux/arch/mips/vr41xx/nec-eagle/init.c.orig linux/arch/mips/vr41xx/nec-eagle/init.c
--- linux/arch/mips/vr41xx/nec-eagle/init.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/vr41xx/nec-eagle/init.c	Tue Jan 20 10:58:13 2004
@@ -44,8 +44,6 @@
 
 #include <asm/bootinfo.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "NEC Eagle/Hawk";
diff -Nru linux/arch/mips/vr41xx/victor-mpc30x/init.c.orig linux/arch/mips/vr41xx/victor-mpc30x/init.c
--- linux/arch/mips/vr41xx/victor-mpc30x/init.c.orig	Tue Nov 18 10:01:26 2003
+++ linux/arch/mips/vr41xx/victor-mpc30x/init.c	Tue Jan 20 10:57:11 2004
@@ -22,8 +22,6 @@
 #include <asm/mipsregs.h>
 #include <asm/vr41xx/vr41xx.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "Victor MP-C303/304";
diff -Nru linux/arch/mips/vr41xx/zao-capcella/init.c.orig linux/arch/mips/vr41xx/zao-capcella/init.c
--- linux/arch/mips/vr41xx/zao-capcella/init.c.orig	Fri Jan  9 15:42:39 2004
+++ linux/arch/mips/vr41xx/zao-capcella/init.c	Tue Jan 20 10:56:50 2004
@@ -23,8 +23,6 @@
 #include <asm/mipsregs.h>
 #include <asm/vr41xx/vr41xx.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "ZAO Networks Capcella";
diff -Nru linux/arch/mips/vr41xx/tanbac-tb0226/init.c.orig linux/arch/mips/vr41xx/tanbac-tb0226/init.c
--- linux/arch/mips/vr41xx/tanbac-tb0226/init.c.orig	Fri Jan  9 15:42:39 2004
+++ linux/arch/mips/vr41xx/tanbac-tb0226/init.c	Tue Jan 20 10:56:34 2004
@@ -23,8 +23,6 @@
 #include <asm/mipsregs.h>
 #include <asm/vr41xx/vr41xx.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "TANBAC TB0226";
diff -Nru linux/arch/mips/vr41xx/tanbac-tb0229/init.c.orig linux/arch/mips/vr41xx/tanbac-tb0229/init.c
--- linux/arch/mips/vr41xx/tanbac-tb0229/init.c.orig	Fri Jan  9 15:42:39 2004
+++ linux/arch/mips/vr41xx/tanbac-tb0229/init.c	Tue Jan 20 10:56:02 2004
@@ -28,8 +28,6 @@
 #include <asm/mipsregs.h>
 #include <asm/vr41xx/vr41xx.h>
 
-char arcs_cmdline[CL_SIZE];
-
 const char *get_system_type(void)
 {
 	return "TANBAC TB0229";
diff -Nru linux/arch/mips/pmc-sierra/yosemite/prom.c.orig linux/arch/mips/pmc-sierra/yosemite/prom.c
--- linux/arch/mips/pmc-sierra/yosemite/prom.c.orig	Wed Dec 17 17:52:13 2003
+++ linux/arch/mips/pmc-sierra/yosemite/prom.c	Tue Jan 20 11:16:50 2004
@@ -34,7 +34,6 @@
 };
 
 struct callvectors* debug_vectors;
-char arcs_cmdline[CL_SIZE];
 
 extern unsigned long yosemite_base;
 extern unsigned long cpu_clock;
diff -Nru linux/arch/mips/configs/osprey_defconfig.orig linux/arch/mips/configs/osprey_defconfig
--- linux/arch/mips/configs/osprey_defconfig.orig	Tue Jan 20 10:10:22 2004
+++ linux/arch/mips/configs/osprey_defconfig	Tue Jan 20 11:03:51 2004
@@ -545,6 +545,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="ip=bootp ether=46,0x03fe0300,eth0"
 # CONFIG_DEBUG_KERNEL is not set
 
 #
diff -Nru linux/arch/mips/configs/ev64120_defconfig.orig linux/arch/mips/configs/ev64120_defconfig
--- linux/arch/mips/configs/ev64120_defconfig.orig	Tue Jan 20 10:10:22 2004
+++ linux/arch/mips/configs/ev64120_defconfig	Tue Jan 20 11:22:57 2004
@@ -595,6 +595,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::"
 # CONFIG_DEBUG_KERNEL is not set
 
 #
diff -Nru linux/arch/mips/configs/ddb5476_defconfig.orig linux/arch/mips/configs/ddb5476_defconfig
--- linux/arch/mips/configs/ddb5476_defconfig.orig	Tue Jan 20 10:10:22 2004
+++ linux/arch/mips/configs/ddb5476_defconfig	Tue Jan 20 11:28:12 2004
@@ -623,6 +623,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="ip=any"
 # CONFIG_DEBUG_KERNEL is not set
 
 #
diff -Nru linux/arch/mips/configs/ddb5477_defconfig.orig linux/arch/mips/configs/ddb5477_defconfig
--- linux/arch/mips/configs/ddb5477_defconfig.orig	Tue Jan 20 10:10:22 2004
+++ linux/arch/mips/configs/ddb5477_defconfig	Tue Jan 20 11:48:16 2004
@@ -272,7 +272,7 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
@@ -282,7 +282,25 @@
 #
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_LAN_SAA9730 is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -482,37 +500,7 @@
 #
 # Sound
 #
-CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
-# CONFIG_SND is not set
-
-#
-# Open Sound System
-#
-CONFIG_SOUND_PRIME=y
-# CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_CMPCI is not set
-# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_CS4281 is not set
-# CONFIG_SOUND_ES1370 is not set
-# CONFIG_SOUND_ES1371 is not set
-# CONFIG_SOUND_ESSSOLO1 is not set
-# CONFIG_SOUND_MAESTRO is not set
-# CONFIG_SOUND_MAESTRO3 is not set
-# CONFIG_SOUND_ICH is not set
-# CONFIG_SOUND_SONICVIBES is not set
-CONFIG_SOUND_VRC5477=y
-# CONFIG_SOUND_TRIDENT is not set
-# CONFIG_SOUND_VIA82CXXX is not set
-# CONFIG_SOUND_OSS is not set
-# CONFIG_SOUND_ALI5455 is not set
-# CONFIG_SOUND_FORTE is not set
-# CONFIG_SOUND_RME96XX is not set
-# CONFIG_SOUND_AD1980 is not set
+# CONFIG_SOUND is not set
 
 #
 # USB support
@@ -614,6 +602,7 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="ip=any"
 # CONFIG_DEBUG_KERNEL is not set
 
 #
@@ -629,4 +618,4 @@
 #
 # Library routines
 #
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=y
diff -Nru linux/include/asm-mips/bootinfo.h.orig linux/include/asm-mips/bootinfo.h
--- linux/include/asm-mips/bootinfo.h.orig	Mon Jan  5 10:34:00 2004
+++ linux/include/asm-mips/bootinfo.h	Tue Jan 20 10:36:16 2004
@@ -240,8 +240,12 @@
 extern void prom_init(void);
 
 /*
+ * Initial kernel command line, usually setup by prom_init()
+ */
+extern char arcs_cmdline[CL_SIZE];
+
+/*
  * Registers a0, a1, a3 and a4 as passed to the kenrel entry by firmware
  */
 extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3;
-
 #endif /* _ASM_BOOTINFO_H */