diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-08-19 09:55:06 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-10-11 11:18:41 -0400 |
commit | e0dfb20c2b77c6626a24578240266ace928cd2e7 (patch) | |
tree | 67666f032698a62b00ee6d91328dd641abe1c498 /arch/mips/txx9/rbtx4938 | |
parent | f96a3383cfede841cdf80a5927f14478981ed78c (diff) |
MIPS: TXx9: Improve handling of built-in and command-line args
* Make prom_init_cmdline() static and be called from prom_init.
* Append built-in args if the first character was '+'.
* Drop command-line args if the first character of built-in was '-'.
* Enclose args include spaces by quotes.
* TX4938_NAND_BOOT is no longer needed.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/rbtx4938')
-rw-r--r-- | arch/mips/txx9/rbtx4938/prom.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c index d73123cd2ab9..bcb469247e8c 100644 --- a/arch/mips/txx9/rbtx4938/prom.c +++ b/arch/mips/txx9/rbtx4938/prom.c | |||
@@ -18,9 +18,6 @@ | |||
18 | 18 | ||
19 | void __init rbtx4938_prom_init(void) | 19 | void __init rbtx4938_prom_init(void) |
20 | { | 20 | { |
21 | #ifndef CONFIG_TX4938_NAND_BOOT | ||
22 | prom_init_cmdline(); | ||
23 | #endif | ||
24 | add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM); | 21 | add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM); |
25 | txx9_sio_putchar_init(TX4938_SIO_REG(0) & 0xfffffffffULL); | 22 | txx9_sio_putchar_init(TX4938_SIO_REG(0) & 0xfffffffffULL); |
26 | } | 23 | } |