Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[~andy/linux] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index ef0077e8771e8ba0b21eea59ff4d58c9e5fb9e22..060e5644c49c4711668835d451885f552a63a210 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -34,6 +34,13 @@ config ARCH_R8A7740
        select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
 
+config ARCH_R8A7779
+       bool "R-Car H1 (R8A77790)"
+       select CPU_V7
+       select SH_CLK_CPG
+       select ARM_GIC
+       select ARCH_WANT_OPTIONAL_GPIOLIB
+
 comment "SH-Mobile Board Type"
 
 config MACH_G3EVM
@@ -86,6 +93,11 @@ config MACH_BONITO
        select ARCH_REQUIRE_GPIOLIB
        depends on ARCH_R8A7740
 
+config MACH_MARZEN
+       bool "MARZEN board"
+       depends on ARCH_R8A7779
+       select ARCH_REQUIRE_GPIOLIB
+
 comment "SH-Mobile System Configuration"
 
 menu "Memory configuration"