diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 14:53:45 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 14:53:45 +0900 |
| commit | 2818b19102fdc414248f772c46af176d36520ae7 (patch) | |
| tree | 0a6f666ab02c12f308de6352a74c8fbc86e36343 /arch/arm/mach-shmobile/Kconfig | |
| parent | 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 (diff) | |
| parent | 25338f2e09fcbaa0470841c928bf0e718ca13382 (diff) | |
Merge branch 'rmobile/mackerel' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 7d56e86c75e..285dbbd4ad2 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -61,6 +61,10 @@ endchoice config MACH_AG5EVM bool "AG5EVM board" depends on ARCH_SH73A0 + +config MACH_MACKEREL + bool "mackerel board" + depends on ARCH_SH7372 select ARCH_REQUIRE_GPIOLIB comment "SH-Mobile System Configuration" @@ -70,9 +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 - default "0x40000000" if MACH_AG5EVM + 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 |