Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

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

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 160b2eef6d819ed102c0a372d62108c98291487c..aeceb9b92aeb3db3857086ecc1a1dee5914ab1ae 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -18,15 +18,30 @@ config ARCH_SH7377
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
 
+config ARCH_SH7372
+       bool "SH-Mobile AP4 (SH7372)"
+       select CPU_V7
+       select HAVE_CLK
+       select COMMON_CLKDEV
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
+
 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
+
+config MACH_AP4EVB
+       bool "AP4EVB board"
+       depends on ARCH_SH7372
+       select ARCH_REQUIRE_GPIOLIB
 
 comment "SH-Mobile System Configuration"
 
@@ -36,6 +51,7 @@ config MEMORY_START
        hex "Physical memory start address"
        default "0x50000000" if MACH_G3EVM
        default "0x40000000" if MACH_G4EVM
+       default "0x40000000" if MACH_AP4EVB
        default "0x00000000"
        ---help---
          Tweak this only when porting to a new machine which does not
@@ -46,6 +62,7 @@ config MEMORY_SIZE
        hex "Physical memory size"
        default "0x08000000" if MACH_G3EVM
        default "0x08000000" if MACH_G4EVM
+       default "0x10000000" if MACH_AP4EVB
        default "0x04000000"
        help
          This sets the default memory size assumed by your kernel. It can