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/devboards/pb1000/board_setup.c | |
| parent | MIPS: Alchemy: devboards: consolidate files (diff) | |
| download | linux-dev-7179380ee9bdeb5fa2ff07581f512fe0f5382e5b.tar.xz linux-dev-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/devboards/pb1000/board_setup.c')
| -rw-r--r-- | arch/mips/alchemy/devboards/pb1000/board_setup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c index b75e487f53ed..889c8fda2ab1 100644 --- a/arch/mips/alchemy/devboards/pb1000/board_setup.c +++ b/arch/mips/alchemy/devboards/pb1000/board_setup.c @@ -28,6 +28,7 @@ #include <linux/interrupt.h> #include <asm/mach-au1x00/au1000.h> #include <asm/mach-pb1x00/pb1000.h> +#include <prom.h> struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { @@ -52,6 +53,15 @@ void __init board_setup(void) u32 sys_freqctrl, sys_clksrc; u32 prid = read_c0_prid(); +#ifdef CONFIG_SERIAL_8250_CONSOLE + char *argptr = prom_getcmdline(); + argptr = strstr(argptr, "console="); + if (argptr == NULL) { + argptr = prom_getcmdline(); + strcat(argptr, " console=ttyS0,115200"); + } +#endif + /* Set AUX clock to 12 MHz * 8 = 96 MHz */ au_writel(8, SYS_AUXPLL); au_writel(0, SYS_PINSTATERD); |