diff options
| author | Ben Collins <bcollins@debian.org> | 2004-01-08 10:14:10 -0800 |
|---|---|---|
| committer | Ben Collins <bcollins@debian.org> | 2004-01-08 10:14:10 -0800 |
| commit | bbd1dca4ab0680eba295217bd54221a44f507d52 (patch) | |
| tree | 00f113a4271ef2130c3e506927c7883474eb0463 | |
| parent | 92bb655022b180b0678d0e3b6cd6cbc5105da0b9 (diff) | |
[SPARC64]: Add option to define default command line to kernel, ala PPC.
| -rw-r--r-- | arch/sparc64/Kconfig | 16 | ||||
| -rw-r--r-- | arch/sparc64/prom/bootstr.c | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 465f9f10c21b..dfff0d578652 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -489,6 +489,22 @@ config WATCHDOG_RIO machines. The watchdog timeout period is normally one minute but can be changed with a boot-time parameter. +config CMDLINE_BOOL + bool "Default bootloader kernel arguments" + +config CMDLINE + string "Initial kernel command string" + depends on CMDLINE_BOOL + default "console=ttyS0,9600 root=/dev/sda1" + help + Say Y here if you want to be able to pass default arguments to + the kernel. This will be overridden by the bootloader, if you + use one (such as SILO). This is most useful if you want to boot + a kernel from TFTP, and want default options to be available + with having them passed on the command line. + + NOTE: This option WILL override the PROM bootargs setting! + endmenu source "drivers/base/Kconfig" diff --git a/arch/sparc64/prom/bootstr.c b/arch/sparc64/prom/bootstr.c index 772a1c6e25e7..a7278614e99d 100644 --- a/arch/sparc64/prom/bootstr.c +++ b/arch/sparc64/prom/bootstr.c @@ -21,6 +21,10 @@ struct { char bootstr_buf[BARG_LEN]; } bootstr_info = { .bootstr_len = BARG_LEN, +#ifdef CONFIG_CMDLINE + .bootstr_valid = 1, + .bootstr_buf = CONFIG_CMDLINE, +#endif }; char * __init |