[MIPS] Initialization of Alchemy boards
An earlier update changed some calls from simple_strotl to strict_strtol but did not account for the differences in the syntax between the calls. simple_strotl returns the integer; strict_strtol returns an error code and takes a pointer to the result. As it was, NULL was being passed in place of the result, which led to failures during kernel initialization when using YAMON. Signed-off-by: Kevin Hickey <khickey@rmicorp.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
af6dc22b03
commit
fd7ccfa7ac
|
@ -57,6 +57,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x04000000;
|
memsize = 0x04000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x04000000;
|
memsize = 0x04000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,6 +52,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x04000000;
|
memsize = 0x04000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x04000000;
|
memsize = 0x04000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
|
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x08000000;
|
memsize = 0x08000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x04000000;
|
memsize = 0x04000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x08000000;
|
memsize = 0x08000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,6 +53,6 @@ void __init prom_init(void)
|
||||||
if (!memsize_str)
|
if (!memsize_str)
|
||||||
memsize = 0x04000000;
|
memsize = 0x04000000;
|
||||||
else
|
else
|
||||||
memsize = strict_strtol(memsize_str, 0, NULL);
|
strict_strtol(memsize_str, 0, &memsize);
|
||||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue