diff options
| author | Helge Deller <deller@gmx.de> | 2022-01-14 07:57:20 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-01-20 20:39:19 +0100 |
| commit | 5f7ee6e37a3cadefe45378c17c4285fa41141d92 (patch) | |
| tree | 9d60950a43d2e23bfd7d9ac39da0cd3a3b8a2610 /arch | |
| parent | bd25c378527f3fde38a496ac2744cbd3924f0803 (diff) | |
| download | linux-rpi-5f7ee6e37a3cadefe45378c17c4285fa41141d92.tar.gz linux-rpi-5f7ee6e37a3cadefe45378c17c4285fa41141d92.tar.bz2 linux-rpi-5f7ee6e37a3cadefe45378c17c4285fa41141d92.zip | |
parisc: Autodetect default output device and set console= kernel parameter
Usually palo (the PA-RISC boot loader) will check at boot time if the
machine/firmware was configured to use the serial line (ttyS0, SERIAL_x)
or the graphical display (tty0, graph) as default output device and add
the correct "console=ttyS0" or "console=tty0" Linux kernel parameter to
the kernel command line when starting the Linux kernel.
But the kernel could also have been started via the HP-UX boot loader
or directly in qemu, in which cases the console parameter is missing.
This patch fixes this problem by adding the correct console= parameter
if it's missing in the current kernel command line.
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/setup.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 456087a2350c..b91cb45ffd4e 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -48,6 +48,7 @@ struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL; void __init setup_cmdline(char **cmdline_p) { extern unsigned int boot_args[]; + char *p; /* Collect stuff passed in from the boot loader */ @@ -59,6 +60,16 @@ void __init setup_cmdline(char **cmdline_p) strscpy(boot_command_line, (char *)__va(boot_args[1]), COMMAND_LINE_SIZE); + /* autodetect console type (if not done by palo yet) */ + p = boot_command_line; + if (!str_has_prefix(p, "console=") && !strstr(p, " console=")) { + strlcat(p, " console=", COMMAND_LINE_SIZE); + if (PAGE0->mem_cons.cl_class == CL_DUPLEX) + strlcat(p, "ttyS0", COMMAND_LINE_SIZE); + else + strlcat(p, "tty0", COMMAND_LINE_SIZE); + } + #ifdef CONFIG_BLK_DEV_INITRD if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ { |