1 files changed, 18 insertions, 1 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 0e318c905eea..573fca1fbd9b 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -9,7 +9,7 @@ config SUPERH
         def_bool y
         select EMBEDDED
         select HAVE_CLK
-        select HAVE_IDE
+        select HAVE_IDE if HAS_IOPORT
         select HAVE_LMB
         select HAVE_OPROFILE
         select HAVE_GENERIC_DMA_COHERENT
@@ -174,6 +174,9 @@ config ARCH_HAS_DEFAULT_IDLE
 config ARCH_HAS_CPU_IDLE_WAIT
         def_bool y
 
+config NO_IOPORT
+        bool
+
 config IO_TRAPPED
         bool
 
@@ -186,6 +189,9 @@ config DMA_NONCOHERENT
 config NEED_DMA_MAP_STATE
         def_bool DMA_NONCOHERENT
 
+config NEED_SG_DMA_LENGTH
+        def_bool y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -773,6 +779,17 @@ config ENTRY_OFFSET
         default "0x00010000" if PAGE_SIZE_64KB
         default "0x00000000"
 
+config ROMIMAGE_MMCIF
+        bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
+        depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
+        help
+          Say Y here to include experimental MMCIF loading code in
+          romImage. With this enabled it is possible to write the romImage
+          kernel image to an MMC card and boot the kernel straight from
+          the reset vector. At reset the processor Mask ROM will load the
+          first part of the romImage which in turn loads the rest the kernel
+          image to RAM using the MMCIF hardware block.
+
 choice
         prompt "Kernel command line"
         optional