diff options
| author | Manuel Lauss <mano@roarinelk.homelinux.net> | 2008-12-21 09:26:16 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2009-01-11 09:57:25 +0000 |
| commit | 7179380ee9bdeb5fa2ff07581f512fe0f5382e5b (patch) | |
| tree | 12bc5c0cfc3506434b0e51829bbbb66aaadf491a /arch/mips/alchemy/mtx-1 | |
| parent | 23ba25d56606eec6fabc37c1efcbd48837dc9adc (diff) | |
| download | talos-op-linux-7179380ee9bdeb5fa2ff07581f512fe0f5382e5b.tar.gz talos-op-linux-7179380ee9bdeb5fa2ff07581f512fe0f5382e5b.zip | |
MIPS: Alchemy: move commandline mangling out of common code
Not every alchemy-based board might want these options forced on it,
and most of this stuff seems to be intended for devboard code anyway.
Remove commandline mangling code out of common chip code and instead
add relevant sections to all in-tree boards to not change existing
behaviour.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/alchemy/mtx-1')
| -rw-r--r-- | arch/mips/alchemy/mtx-1/board_setup.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c index 3f8079186cf2..8ed1ae12bc55 100644 --- a/arch/mips/alchemy/mtx-1/board_setup.c +++ b/arch/mips/alchemy/mtx-1/board_setup.c @@ -32,6 +32,8 @@ #include <asm/mach-au1x00/au1000.h> +#include <prom.h> + extern int (*board_pci_idsel)(unsigned int devsel, int assert); int mtx1_pci_idsel(unsigned int devsel, int assert); @@ -43,6 +45,16 @@ void board_reset(void) void __init board_setup(void) { +#ifdef CONFIG_SERIAL_8250_CONSOLE + char *argptr; + argptr = prom_getcmdline(); + argptr = strstr(argptr, "console="); + if (argptr == NULL) { + argptr = prom_getcmdline(); + strcat(argptr, " console=ttyS0,115200"); + } +#endif + #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) /* Enable USB power switch */ au_writel(au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR); |
