linux-mips
[Top] [All Lists]

Re: [PATCH 32/35] MIPS: txx9: Cleanup firmware support for txx9 platform

To: "Steven J. Hill" <sjhill@mips.com>
Subject: Re: [PATCH 32/35] MIPS: txx9: Cleanup firmware support for txx9 platforms.
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 6 Jun 2012 15:27:29 +0200
Cc: linux-mips@linux-mips.org, ralf@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=474hVnNMj6QmIQKH9a/maAI24fzXcAeTTtuMI9498OE=; b=hyqzNgkOxwyLX/kAH9X5a8OPOst6Dfq+6F0Ylb/UVCGoQtgMtlUHmg622VwMoC8Mlv ULN78Qdp7B6fjkdBoq8aWltgKcbX/ocUqxOHDz2LUyViE0q/dlk7+2Be90lO6qqwVCfq Yc6x1StTncrR/gbHM74rDmREhzFsbvbgJPBH4sMqWVNrza61JeOgKCNLADwml9NADbws a/D3C8nM4M0WTjUZtvFg9HIbAE4PP+tT7baLOqoVs3imsAWf1jH/rVv6Wld76fSm4T86 aeodJhOzCrF/SQ/MdOwXAnziiC8UwqEls1b7+xojFseSd1V5HxBW5/AB1mRAQqf1je4L kZQQ==
In-reply-to: <1338931179-9611-33-git-send-email-sjhill@mips.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1338931179-9611-1-git-send-email-sjhill@mips.com> <1338931179-9611-33-git-send-email-sjhill@mips.com>
Sender: linux-mips-bounce@linux-mips.org
Hi Steven,

On Tue, Jun 5, 2012 at 11:19 PM, Steven J. Hill <sjhill@mips.com> 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@linux-m68k.org

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

<Prev in Thread] Current Thread [Next in Thread>