Use the flash0_size from the adm5120_board structure to correctly remap the flash...

[openwrt.git] / 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 ba8051e..1cbbbc2 100644 (file)
--- 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) 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
  *
  *  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,6 +30,8 @@
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 

+#include <asm/mach-adm5120/adm5120_info.h>
+

 void setup_prom_printf(int);
 void prom_printf(char *, ...);
 void prom_meminit(void);
 void setup_prom_printf(int);
 void prom_printf(char *, ...);
 void prom_meminit(void);


@@ -95,18 +98,26 @@ char *prom_getenv(char *envname)
        printk(KERN_INFO "GETENV: not found.\n");
        return(NULL);
 }
        printk(KERN_INFO "GETENV: not found.\n");
        return(NULL);
 }

-       
+
+
+extern char _image_cmdline;

 /*
  * initialize the prom module.
  */
 void __init prom_init(void)
 {
 /*
  * initialize the prom module.
  */
 void __init prom_init(void)
 {

+       char *cmd;
+
+       adm5120_info_init();
+

        /* you should these macros defined in include/asm/bootinfo.h */
        /* you should these macros defined in include/asm/bootinfo.h */

-       mips_machgroup = MACH_GROUP_ADM_GW;
-       mips_machtype = MACH_ADM_GW_5120;
+       mips_machgroup = MACH_GROUP_ADM5120;
+       mips_machtype = adm5120_board.mach_type;

 
        /* init command line, register a default kernel command line */
 
        /* init command line, register a default kernel command line */

-       strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=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();
 
        /* init memory map */
        prom_meminit();