Merge tag 'renesas-r8a7740-multiplatform-for-v3.18' of git://git.kernel.org/pub/scm...

Pull "Renesas ARM Based SoC r8a7740 Multiplatform Updates for v3.18" from Simon Horman:

* Enable multiplatform support for r8a7740 SoC and remove
  its DT-reference C board DTS files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-r8a7740-multiplatform-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva reference: Remove DTS
  ARM: shmobile: armadillo800eva reference: Remove C board code
  ARM: shmobile: r8a7740: Add restart callback
  ARM: shmobile: armadillo800eva: Build DTS for multiplatform
  ARM: shmobile: armadillo800eva: Sync DTS
  ARM: shmobile: r8a7740: Multiplatform support

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile.boot
index a23e1555cca7b9f5c485b961757985d49d5f646a,ec8caffdb5d0533578592774cc0532ad5f559b48..de9a23852fc8caeb8a1173c44339f856deee04e7
--- 1/arch/arm/mach-shmobile/Makefile.boot
--- 2/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@@ -3,9 -3,9 +3,8 @@@ loadaddr-y       :
  loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
  loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
  loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
- loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
  loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
  loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 -loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000
  loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
  loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
  loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000