X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3f8c5b95adbaa43fd5fcfa94a713971e8331fc58..8652c1f1c9087a2a043b1aacaca6cfeb86e0e532:/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
index e644fc37c..1cbbbc2de 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
@@ -3,6 +3,7 @@
  * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
  * Copyright (C) 2003 ADMtek Incorporated.
  *	daniell@admtek.com.tw
+ * Copyright (C) 2007 OpenWrt.org
  *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
@@ -29,7 +30,7 @@
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 
-#include <adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_info.h>
 
 void setup_prom_printf(int);
 void prom_printf(char *, ...);
@@ -98,20 +99,25 @@ char *prom_getenv(char *envname)
 	return(NULL);
 }
 
-	
+
+extern char _image_cmdline;
 /*
  * initialize the prom module.
  */
 void __init prom_init(void)
 {
-	/* you should these macros defined in include/asm/bootinfo.h */
-	mips_machgroup = MACH_GROUP_ADM_GW;
-	mips_machtype = MACH_ADM_GW_5120;
-	
+	char *cmd;
+
 	adm5120_info_init();
 
+	/* you should these macros defined in include/asm/bootinfo.h */
+	mips_machgroup = MACH_GROUP_ADM5120;
+	mips_machtype = adm5120_board.mach_type;
+
 	/* init command line, register a default kernel command line */
-	strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit");
+	cmd = &_image_cmdline + 8;
+	if( strlen(cmd) > 0) strcpy( &(arcs_cmdline[0]), cmd);
+		else strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
 
 	/* init memory map */
 	prom_meminit();