diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-06 10:09:08 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-06 10:09:08 +0200 |
| commit | ff20775d189cf8f36684c88f6f95e00d21bc783c (patch) | |
| tree | e1ef59c548e0be9787fc16b02cb3cecd1635c53f /arch/arm/mach-shmobile/Makefile.boot | |
| parent | 39aa437e18cac7acae55481ed73feea0de497399 (diff) | |
| parent | c99cd90d98a98aa101b169e44d249e5cd71f46f2 (diff) | |
Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Renesas ARM Based SoC Marzen Board Removal for v4.3
* Remove legacy r8a7779 SoC code
* Remove legacy marzen board code
* tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Remove legacy SoC code
ARM: shmobile: marzen: Remove legacy board code
ARM: shmobile: r8a7779: Cleanup header file
ARM: shmobile: marzen-reference: Remove C board code
ARM: shmobile: r8a7779: Generic SMP ops
ARM: shmobile: r8a7779: Generic CCF and timer support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile.boot | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot index 14cdfc0ed075..a489fe9a76cd 100644 --- a/arch/arm/mach-shmobile/Makefile.boot +++ b/arch/arm/mach-shmobile/Makefile.boot @@ -2,7 +2,6 @@ loadaddr-y := loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 -loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 __ZRELADDR := $(sort $(loadaddr-y)) zreladdr-y += $(__ZRELADDR) |