Read the size of the available memory from parameters passed to the kernel by firmware.

SVN-Revision: 18604

diff --git a/target/linux/amazon/files/arch/mips/amazon/prom.c b/target/linux/amazon/files/arch/mips/amazon/prom.c
index f138bcbef4d6925fbc5f5de3fe4d365f40edb3ba..c5db4f5cdcdc916e05e259983f2922cb7672f9f6 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,28 @@ void prom_printf(const char * fmt, ...)
 
 void __init prom_init(void)
 {
+       char **envp = (char **) fw_arg2;
+
+       int memsize = 16; /* assume 16M as default */
+
        mips_machgroup = MACH_GROUP_INFINEON;
        mips_machtype = MACH_INFINEON_AMAZON;
 
+       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)

diff --git a/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch b/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch
index c2c7fbd3af04dc2f26acef4c9845a8650fffc7ca..3683a273253e7fe03237d1f8723e51ab2d4fcda9 100644 (file)
--- a/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch
+++ b/target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch
@@ -1,12 +1,12 @@
 --- a/arch/mips/amazon/prom.c
 +++ b/arch/mips/amazon/prom.c
-@@ -59,9 +59,6 @@ void prom_printf(const char * fmt, ...)
+@@ -63,9 +63,6 @@ void __init prom_init(void)
+ 
+       int memsize = 16; /* assume 16M as default */
  
- void __init prom_init(void)
- {
 -      mips_machgroup = MACH_GROUP_INFINEON;
 -      mips_machtype = MACH_INFINEON_AMAZON;
 -
-       strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2");
-       
-       add_memory_region(0x00000000, 0x1000000, BOOT_MEM_RAM);
+       envp = (char **)KSEG1ADDR((unsigned long)envp);
+       while (*envp) {
+               char *e = (char *)KSEG1ADDR(*envp);