diff options
| author |   Yoichi Yuasa <yuasa@linux-mips.org> | 2009-12-18 21:38:37 +0900 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2010-01-12 18:19:33 +0100 |
| commit | 7e326d687d182e45447c24daccaa9b60bae130d5 (patch) | |
| tree | 60958ec62e35aacc5471503a4ef3d58c6ccb93f6 /arch/mips/powertv/init.c | |
| parent | MIPS: PowerTV: Remove unused platform_die() (diff) | |
| download | linux-dev-7e326d687d182e45447c24daccaa9b60bae130d5.tar.xz linux-dev-7e326d687d182e45447c24daccaa9b60bae130d5.zip | |
MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init()
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/801/
Reviewed-by: David VomLehn <dvomlehn@cisco.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/powertv/init.c')
| -rw-r--r-- | arch/mips/powertv/init.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/mips/powertv/init.c b/arch/mips/powertv/init.c index 5f4e4c304e48..de0e46ab0957 100644 --- a/arch/mips/powertv/init.c +++ b/arch/mips/powertv/init.c @@ -34,10 +34,7 @@ #include <asm/mips-boards/generic.h> #include <asm/mach-powertv/asic.h> -#include "init.h" - -int prom_argc; -int *_prom_argv, *_prom_envp; +static int *_prom_envp; unsigned long _prom_memsize; /* @@ -109,8 +106,11 @@ static void __init mips_ejtag_setup(void) void __init prom_init(void) { + int prom_argc; + char *prom_argv; + prom_argc = fw_arg0; - _prom_argv = (int *) fw_arg1; + prom_argv = (char *) fw_arg1; _prom_envp = (int *) fw_arg2; _prom_memsize = (unsigned long) fw_arg3; @@ -118,7 +118,10 @@ void __init prom_init(void) board_ejtag_handler_setup = mips_ejtag_setup; pr_info("\nLINUX started...\n"); - prom_init_cmdline(); + + if (prom_argc == 1) + strlcat(arcs_cmdline, prom_argv, COMMAND_LINE_SIZE); + configure_platform(); prom_meminit(); |