From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 30 Nov 2010 05:53:45 +0000 (+0900)
Subject: Merge branch 'rmobile/mackerel' into rmobile-latest
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2818b19102fdc414248f772c46af176d36520ae7;p=linux-beck.git

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>
---

2818b19102fdc414248f772c46af176d36520ae7
diff --cc arch/arm/mach-shmobile/Kconfig
index 7d56e86c75e0,7b2edd799fb4..285dbbd4ad2c
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -58,9 -51,9 +58,13 @@@ config AP4EVB_WVG
  
  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 -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
- 	default "0x40000000" if MACH_AG5EVM
 -	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
diff --cc arch/arm/mach-shmobile/Makefile
index efd89136f0d7,11f3242ffc1d..2d8328d5dd57
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -22,4 -20,4 +22,5 @@@ obj-$(CONFIG_GENERIC_GPIO)	+= $(pfc-y
  obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o
  obj-$(CONFIG_MACH_G4EVM)	+= board-g4evm.o
  obj-$(CONFIG_MACH_AP4EVB)	+= board-ap4evb.o
 +obj-$(CONFIG_MACH_AG5EVM)	+= board-ag5evm.o
+ obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o