[SPARC64]: Add option to define default command line to kernel, ala PPC.

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 465f9f10c21b59e395f830ecf128e321729b06d0..dfff0d5786527c2b6117e69e3474975e68209f2f 100644 (file)
--- 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 772a1c6e25e76febc3bd08d1649fa91d80f7e446..a7278614e99dcd95e1d45bdf7bd4b27a00b48bdc 100644 (file)
--- 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