Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile...

[linux.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 2b2107ce93c08b0a70f007d1e72d1065f10116b5..4d1b4c5c938931065166555dffa9f5b7779f7cfe 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -20,6 +20,13 @@ config ARCH_SH7372
        select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
 
+config ARCH_SH73A0
+       bool "SH-Mobile AG5 (R8A73A00)"
+       select CPU_V7
+       select SH_CLK_CPG
+       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARM_GIC
+
 comment "SH-Mobile Board Type"
 
 config MACH_G3EVM
@@ -51,6 +58,10 @@ config AP4EVB_WVGA
 
 endchoice
 
+config MACH_AG5EVM
+       bool "AG5EVM board"
+       depends on ARCH_SH73A0
+
 config MACH_MACKEREL
        bool "mackerel board"
        depends on ARCH_SH7372
@@ -63,8 +74,8 @@ menu "Memory configuration"
 config MEMORY_START
        hex "Physical memory start address"
        default "0x50000000" if MACH_G3EVM
-       default "0x40000000" if MACH_G4EVM
-       default "0x40000000" if MACH_AP4EVB || MACH_MACKEREL
+       default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
+                               MACH_MACKEREL
        default "0x00000000"
        ---help---
          Tweak this only when porting to a new machine which does not
@@ -75,6 +86,7 @@ config MEMORY_SIZE
        hex "Physical memory size"
        default "0x08000000" if MACH_G3EVM
        default "0x08000000" if MACH_G4EVM
+       default "0x20000000" if MACH_AG5EVM
        default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL
        default "0x04000000"
        help