Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd7ccfa7 authored by Kevin Hickey's avatar Kevin Hickey Committed by Ralf Baechle
Browse files

[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: default avatarKevin Hickey <khickey@rmicorp.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent af6dc22b

arch/mips/au1000/db1x00/init.c

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,6 @@ void __init prom_init(void) 
	if (!memsize_str)

		memsize = 0x04000000;

	else

		memsize = strict_strtol(memsize_str, 0, NULL);

		strict_strtol(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/au1000/mtx-1/init.c

+1 −1
Original line number Diff line number Diff line
@@ -55,6 +55,6 @@ void __init prom_init(void) 
	if (!memsize_str)

		memsize = 0x04000000;

	else

		memsize = strict_strtol(memsize_str, 0, NULL);

		strict_strtol(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/au1000/pb1000/init.c

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ void __init prom_init(void) 
	if (!memsize_str)

		memsize = 0x04000000;

	else

		memsize = strict_strtol(memsize_str, 0, NULL);

		strict_strtol(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/au1000/pb1100/init.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void __init prom_init(void) 
	if (!memsize_str)

		memsize = 0x04000000;

	else

		memsize = strict_strtol(memsize_str, 0, NULL);

		strict_strtol(memsize_str, 0, &memsize);



	add_memory_region(0, memsize, BOOT_MEM_RAM);

}

arch/mips/au1000/pb1200/init.c

+1 −1
Original line number Diff line number Diff line
@@ -53,6 +53,6 @@ void __init prom_init(void) 
	if (!memsize_str)

		memsize = 0x08000000;

	else

		memsize = strict_strtol(memsize_str, 0, NULL);

		strict_strtol(memsize_str, 0, &memsize);

	add_memory_region(0, memsize, BOOT_MEM_RAM);

}