Hi Steven,
On Tue, Jun 5, 2012 at 11:19 PM, Steven J. Hill <sjhill@xxxxxxxx> wrote:
> --- a/arch/mips/txx9/generic/setup.c
> +++ b/arch/mips/txx9/generic/setup.c
> @@ -25,11 +25,11 @@
> #include <linux/device.h>
> #include <linux/slab.h>
> #include <linux/irq.h>
> -#include <asm/bootinfo.h>
> #include <asm/time.h>
> #include <asm/reboot.h>
> #include <asm/r4kcache.h>
> #include <asm/sections.h>
> +#include <asm/fw/fw.h>
> #include <asm/txx9/generic.h>
> #include <asm/txx9/pci.h>
> #include <asm/txx9tmr.h>
> @@ -157,39 +157,6 @@ static struct txx9_board_vec *__init find_board_byname(const char *name)
> return NULL;
> }
>
> -static void __init prom_init_cmdline(void)
> -{
> - int argc;
> - int *argv32;
> - int i; /* Always ignore the "-c" at argv[0] */
> -
> - if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) {
> - /*
> - * argc is not a valid number, or argv32 is not a valid
> - * pointer
> - */
> - argc = 0;
> - argv32 = NULL;
> - } else {
> - argc = (int)fw_arg0;
> - argv32 = (int *)fw_arg1;
> - }
> -
> @@ -378,7 +345,7 @@ static void __init select_board(void)
>
> void __init prom_init(void)
> {
> - prom_init_cmdline();
> + fw_init_cmdline();
This basically reverts commit 97b0511ce125b0cb95d73b198c1bdbb3cebc4de2
("MIPS: TXx9: Make firmware parameter passing more robust"), so it's gonna
die horribly on RBTX4927 with VxWorks bootloader.
Can you add the checks to fw_init_cmdline()? I guess they don't harm on other
boards anyway.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
