1 files changed, 4 insertions, 27 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 8ae100cc655c..9255546e7bf6 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -2,18 +2,6 @@ if ARCH_SHMOBILE
 
 comment "SH-Mobile System Type"
 
-config ARCH_SH7367
-        bool "SH-Mobile G3 (SH7367)"
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        select CPU_V6
-        select SH_CLK_CPG
-
-config ARCH_SH7377
-        bool "SH-Mobile G4 (SH7377)"
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        select CPU_V7
-        select SH_CLK_CPG
-
 config ARCH_SH7372
         bool "SH-Mobile AP4 (SH7372)"
         select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -41,6 +29,8 @@ config ARCH_R8A7779
         select ARM_GIC
         select CPU_V7
         select SH_CLK_CPG
+        select USB_ARCH_HAS_EHCI
+        select USB_ARCH_HAS_OHCI
 
 config ARCH_EMEV2
         bool "Emma Mobile EV2"
@@ -50,17 +40,6 @@ config ARCH_EMEV2
 
 comment "SH-Mobile Board Type"
 
-config MACH_G3EVM
-        bool "G3EVM board"
-        depends on ARCH_SH7367
-        select ARCH_REQUIRE_GPIOLIB
-
-config MACH_G4EVM
-        bool "G4EVM board"
-        depends on ARCH_SH7377
-        select ARCH_REQUIRE_GPIOLIB
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-
 config MACH_AP4EVB
         bool "AP4EVB board"
         depends on ARCH_SH7372
@@ -95,6 +74,7 @@ config MACH_MACKEREL
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
+        select USE_OF
 
 config MACH_KOTA2
         bool "KOTA2 board"
@@ -146,8 +126,7 @@ menu "Memory configuration"
 
 config MEMORY_START
         hex "Physical memory start address"
-        default "0x50000000" if MACH_G3EVM
-        default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
+        default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \
                                 MACH_MACKEREL || MACH_BONITO || \
                                 MACH_ARMADILLO800EVA
         default "0x41000000" if MACH_KOTA2
@@ -159,8 +138,6 @@ config MEMORY_START
 
 config MEMORY_SIZE
         hex "Physical memory size"
-        default "0x08000000" if MACH_G3EVM
-        default "0x08000000" if MACH_G4EVM
         default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
                                 MACH_ARMADILLO800EVA
         default "0x1e000000" if MACH_KOTA2