diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-05-15 15:32:09 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 14:56:29 +0400 |
| commit | 1ece7f7bb014485b13faf9504b238ff891a9088a (patch) | |
| tree | 37c7b27b9561cba3bda0682bb286188d106ae201 /arch/arm/mach-shmobile/Makefile.boot | |
| parent | 2b2084e8d4ae9265a3240722cb8adce06c0f393f (diff) | |
| download | linux-1ece7f7bb014485b13faf9504b238ff891a9088a.tar.xz | |
ARM: shmobile: Remove non-multiplatform Marzen reference support
Now that r8a7779 has CCF support remove the legacy Marzen reference
Kconfig bits CONFIG_MACH_MARZEN_REFERENCE for the non-multiplatform
case.
Starting from this commit Marzen board support is always enabled via
CONFIG_MACH_MARZEN, and CONFIG_ARCH_MULTIPLATFORM is used to select
between board-marzen.c and board-marzen-reference.c
The file board-marzen-reference.c can no longer be used together with
the legacy sh-clk clock framework, instead CCF is used.
Based on work for the Koelsch board by Laurent Pinchart.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
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 918fccffa1b6..ebf97d4bcfd8 100644 --- a/arch/arm/mach-shmobile/Makefile.boot +++ b/arch/arm/mach-shmobile/Makefile.boot @@ -13,7 +13,6 @@ loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 -loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000 __ZRELADDR := $(sort $(loadaddr-y)) zreladdr-y += $(__ZRELADDR) |