1 files changed, 22 insertions, 1 deletions

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 48479e014dac..87902e0298e2 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -1,5 +1,9 @@
 menu "Kernel hacking"
 
+config TRACE_IRQFLAGS_SUPPORT
+        bool
+        default y
+
 source "lib/Kconfig.debug"
 
 config SH_STANDARD_BIOS
@@ -17,7 +21,19 @@ config SH_STANDARD_BIOS
 
 config EARLY_SCIF_CONSOLE
         bool "Use early SCIF console"
-        depends on CPU_SH4 || CPU_SH2A && !SH_STANDARD_BIOS
+        help
+          This enables an early console using a fixed SCIF port. This can
+          be used by platforms that are either not running the SH
+          standard BIOS, or do not wish to use the BIOS callbacks for the
+          serial I/O.
+
+config EARLY_SCIF_CONSOLE_PORT
+        hex "SCIF port for early console"
+        depends on EARLY_SCIF_CONSOLE
+        default "0xffe00000" if CPU_SUBTYPE_SH7780
+        default "0xfffe9800" if CPU_SUBTYPE_SH7206
+        default "0xf8420000" if CPU_SUBTYPE_SH7619
+        default "0xffe80000" if CPU_SH4
 
 config EARLY_PRINTK
         bool "Early printk support"
@@ -30,6 +46,11 @@ config EARLY_PRINTK
           when the kernel may crash or hang before the serial console is
           initialised. If unsure, say N.
 
+          On devices that are running SH-IPL and want to keep the port
+          initialization consistent while not using the BIOS callbacks,
+          select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
+          the kernel command line option to toggle back and forth.
+
 config DEBUG_STACKOVERFLOW
         bool "Check for stack overflows"
         depends on DEBUG_KERNEL