1 files changed, 81 insertions, 4 deletions

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 364ca8938807..43dc27997730 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -6,15 +6,66 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
+config EARLY_PRINTK
+        bool "Early printk" if EMBEDDED
+        depends on SYS_HAS_EARLY_PRINTK
+        default y
+        help
+          This option enables special console drivers which allow the kernel
+          to print messages very early in the bootup process.
+
+          This is useful for kernel debugging when your machine crashes very
+          early before the console code is initialized. For normal operation,
+          it is not recommended because it looks ugly on some machines and
+          doesn't cooperate with an X server. You should normally say N here,
+          unless you want to debug such a crash.
+
+config CMDLINE_BOOL
+        bool "Built-in kernel command line"
+        default n
+        help
+          For most systems, it is firmware or second stage bootloader that
+          by default specifies the kernel command line options.  However,
+          it might be necessary or advantageous to either override the
+          default kernel command line or add a few extra options to it.
+          For such cases, this option allows you to hardcode your own
+          command line options directly into the kernel.  For that, you
+          should choose 'Y' here, and fill in the extra boot arguments
+          in CONFIG_CMDLINE.
+
+          The built-in options will be concatenated to the default command
+          line if CMDLINE_OVERRIDE is set to 'N'. Otherwise, the default
+          command line will be ignored and replaced by the built-in string.
+
+          Most MIPS systems will normally expect 'N' here and rely upon
+          the command line from the firmware or the second-stage bootloader.
+
 config CMDLINE
         string "Default kernel command string"
+        depends on CMDLINE_BOOL
         default ""
         help
           On some platforms, there is currently no way for the boot loader to
-          pass arguments to the kernel. For these platforms, you can supply
-          some command-line options at build time by entering them here.  In
-          other cases you can specify kernel args so that you don't have
-          to set them up in board prom initialization routines.
+          pass arguments to the kernel.  For these platforms, and for the cases
+          when you want to add some extra options to the command line or ignore
+          the default command line, you can supply some command-line options at
+          build time by entering them here.  In other cases you can specify
+          kernel args so that you don't have to set them up in board prom
+          initialization routines.
+
+          For more information, see the CMDLINE_BOOL and CMDLINE_OVERRIDE
+          options.
+
+config CMDLINE_OVERRIDE
+        bool "Built-in command line overrides firware arguments"
+        default n
+        depends on CMDLINE_BOOL
+        help
+          By setting this option to 'Y' you will have your kernel ignore
+          command line arguments from firmware or second stage bootloader.
+          Instead, the built-in command line will be used exclusively.
+
+          Normally, you will choose 'N' here.
 
 config DEBUG_STACK_USAGE
         bool "Enable stack utilization instrumentation"
@@ -51,4 +102,30 @@ config RUNTIME_DEBUG
           arch/mips/include/asm/debug.h for debugging macros.
           If unsure, say N.
 
+config DEBUG_ZBOOT
+        bool "Enable compressed kernel support debugging"
+        depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT
+        default n
+        help
+          If you want to add compressed kernel support to a new board, and the
+          board supports uart16550 compatible serial port, please select
+          SYS_SUPPORTS_ZBOOT_UART16550 for your board and enable this option to
+          debug it.
+
+          If your board doesn't support uart16550 compatible serial port, you
+          can try to select SYS_SUPPORTS_ZBOOT and use the other methods to
+          debug it. for example, add a new serial port support just as
+          arch/mips/boot/compressed/uart-16550.c does.
+
+          After the compressed kernel support works, please disable this option
+          to reduce the kernel image size and speed up the booting procedure a
+          little.
+
+config SPINLOCK_TEST
+        bool "Enable spinlock timing tests in debugfs"
+        depends on DEBUG_FS
+        default n
+        help
+          Add several files to the debugfs to test spinlock speed.
+
 endmenu