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/db1x00 | |
| 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/db1x00')
| -rw-r--r-- | arch/mips/alchemy/devboards/db1x00/board_setup.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c index 427f799031bb..a75ffbf99f25 100644 --- a/arch/mips/alchemy/devboards/db1x00/board_setup.c +++ b/arch/mips/alchemy/devboards/db1x00/board_setup.c @@ -32,6 +32,9 @@ #include <asm/mach-au1x00/au1000.h> #include <asm/mach-db1x00/db1x00.h> +#include <prom.h> + + static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; const char *get_system_type(void) @@ -52,6 +55,31 @@ void board_reset(void) void __init board_setup(void) { u32 pin_func = 0; + char *argptr; + + argptr = prom_getcmdline(); +#ifdef CONFIG_SERIAL_8250_CONSOLE + argptr = strstr(argptr, "console="); + if (argptr == NULL) { + argptr = prom_getcmdline(); + strcat(argptr, " console=ttyS0,115200"); + } +#endif + +#ifdef CONFIG_FB_AU1100 + argptr = strstr(argptr, "video="); + if (argptr == NULL) { + argptr = prom_getcmdline(); + /* default panel */ + /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/ + } +#endif + +#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000) + /* au1000 does not support vra, au1500 and au1100 do */ + strcat(argptr, " au1000_audio=vra"); + argptr = prom_getcmdline(); +#endif /* Not valid for Au1550 */ #if defined(CONFIG_IRDA) && \ |