[amazon] Apply patch 210-remove_unnedded_variables.patch directly

[openwrt-10.03/.git] / target / linux / amazon / files / arch / mips / amazon / prom.c

diff --git a/target/linux/amazon/files/arch/mips/amazon/prom.c b/target/linux/amazon/files/arch/mips/amazon/prom.c
index 2947473ad060ff3e3ea421be57b14b474b2d4034..28ef13b3d3d0ee7431cd34fe50b0130c31679147 100644 (file)
--- a/target/linux/amazon/files/arch/mips/amazon/prom.c
+++ b/target/linux/amazon/files/arch/mips/amazon/prom.c
@@ -59,12 +59,25 @@ void prom_printf(const char * fmt, ...)
 
 void __init prom_init(void)
 {
-       mips_machgroup = MACH_GROUP_INFINEON;
-       mips_machtype = MACH_INFINEON_AMAZON;
+       char **envp = (char **) fw_arg2;
 
-       strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit");
+       int memsize = 16; /* assume 16M as default */
+
+       envp = (char **)KSEG1ADDR((unsigned long)envp);
+       while (*envp) {
+               char *e = (char *)KSEG1ADDR(*envp);
+
+               if (!strncmp(e, "memsize=", 8)) {
+                       e += 8;
+                       memsize = simple_strtoul(e, NULL, 10);
+               }
+               envp++;
+       }
+       memsize *= 1024 * 1024;
+
+       strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2");
        
-       add_memory_region(0x00000000, 0x1000000, BOOT_MEM_RAM);
+       add_memory_region(0x00000000, memsize, BOOT_MEM_RAM);
 }
 
 void prom_free_prom_memory(void)