From: Arnd Bergmann Date: Tue, 9 Sep 2014 15:07:30 +0000 (+0200) Subject: Merge tag 'renesas-r8a7740-multiplatform-for-v3.18' of git://git.kernel.org/pub/scm... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb492df9616156416e160bb59f7fd0437d6f5424;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'renesas-r8a7740-multiplatform-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc 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 * 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 --- eb492df9616156416e160bb59f7fd0437d6f5424 diff --cc arch/arm/mach-shmobile/Makefile.boot index a23e1555cca7,ec8caffdb5d0..de9a23852fc8 --- a/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