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

SVN-Revision: 18604
master
Hauke Mehrtens 15 years ago
parent fa0396c530
commit 6fe93904b0
  1. 18
      target/linux/amazon/files/arch/mips/amazon/prom.c
  2. 12
      target/linux/amazon/patches-2.6.30/210-remove_unnedded_variables.patch

@ -59,12 +59,28 @@ void prom_printf(const char * fmt, ...)
void __init prom_init(void) void __init prom_init(void)
{ {
char **envp = (char **) fw_arg2;
int memsize = 16; /* assume 16M as default */
mips_machgroup = MACH_GROUP_INFINEON; mips_machgroup = MACH_GROUP_INFINEON;
mips_machtype = MACH_INFINEON_AMAZON; 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"); 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) void prom_free_prom_memory(void)

@ -1,12 +1,12 @@
--- a/arch/mips/amazon/prom.c --- a/arch/mips/amazon/prom.c
+++ b/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_machgroup = MACH_GROUP_INFINEON;
- mips_machtype = MACH_INFINEON_AMAZON; - mips_machtype = MACH_INFINEON_AMAZON;
- -
strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=squashfs,jffs2"); envp = (char **)KSEG1ADDR((unsigned long)envp);
while (*envp) {
add_memory_region(0x00000000, 0x1000000, BOOT_MEM_RAM); char *e = (char *)KSEG1ADDR(*envp);

Loading…
Cancel
Save