1 files changed, 6 insertions, 11 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 4f3891215b87..4d16d8917074 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -135,12 +135,6 @@ config SH_HP6XX
           More information (hardware only) at
           <http://www.hp.com/jornada/>.
 
-config SH_EC3104
-        bool "EC3104"
-        help
-          Select EC3104 if configuring for a system with an Eclipse
-          International EC3104 chip, e.g. the Harris AD2000.
-
 config SH_SATURN
         bool "Saturn"
         select CPU_SUBTYPE_SH7604
@@ -156,9 +150,6 @@ config SH_DREAMCAST
           <http://www.m17n.org/linux-sh/dreamcast/>.  There is a
           Dreamcast project is at <http://linuxdc.sourceforge.net/>.
 
-config SH_BIGSUR
-        bool "BigSur"
-
 config SH_MPC1211
         bool "Interface MPC1211"
         help
@@ -481,6 +472,7 @@ config SH_PCLK_FREQ
 
 config SH_CLK_MD
         int "CPU Mode Pin Setting"
+        default 0
         depends on CPU_SUBTYPE_SH7619 || CPU_SUBTYPE_SH7206
         help
           MD2 - MD0 pin setting.
@@ -510,8 +502,9 @@ source "arch/sh/cchips/Kconfig"
 config HEARTBEAT
         bool "Heartbeat LED"
         depends on SH_MPC1211 || SH_SH03 || \
-                   SH_BIGSUR || SOLUTION_ENGINE || \
-                   SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK
+                   SOLUTION_ENGINE || \
+                   SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK || \
+                   SH_R7780RP
         help
           Use the power-on LED on your machine as a load meter.  The exact
           behavior is platform-dependent, but normally the flash frequency is
@@ -596,6 +589,8 @@ menu "Boot options"
 config ZERO_PAGE_OFFSET
         hex "Zero page offset"
         default "0x00004000" if SH_MPC1211 || SH_SH03
+        default "0x00010000" if PAGE_SIZE_64KB
+        default "0x00002000" if PAGE_SIZE_8KB
         default "0x00001000"
         help
           This sets the default offset of zero page.