| From ee14349c8c70e38205911f671501ee5dd7cd0737 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 15 May 2014 20:32:09 +0900 |
| Subject: 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> |
| (cherry picked from commit 1ece7f7bb014485b13faf9504b238ff891a9088a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/Makefile | 1 - |
| arch/arm/mach-shmobile/Kconfig | 13 ------------- |
| arch/arm/mach-shmobile/Makefile | 1 - |
| arch/arm/mach-shmobile/Makefile.boot | 1 - |
| 4 files changed, 16 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 290dabcb63fe..776b3aa1d1a7 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -250,7 +250,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ |
| r8a7778-bockw-reference.dtb \ |
| r8a7740-armadillo800eva-reference.dtb \ |
| r8a7779-marzen.dtb \ |
| - r8a7779-marzen-reference.dtb \ |
| r8a7791-koelsch.dtb \ |
| r8a7790-lager.dtb \ |
| sh73a0-kzm9g.dtb \ |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index d9ed05172a04..3e2380130769 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -249,19 +249,6 @@ config MACH_MARZEN |
| select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| select USE_OF |
| |
| -config MACH_MARZEN_REFERENCE |
| - bool "MARZEN board - Reference Device Tree Implementation" |
| - depends on ARCH_R8A7779 |
| - select ARCH_REQUIRE_GPIOLIB |
| - select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| - select USE_OF |
| - ---help--- |
| - Use reference implementation of Marzen board support |
| - which makes use of device tree at the expense |
| - of not supporting a number of devices. |
| - |
| - This is intended to aid developers |
| - |
| config MACH_LAGER |
| bool "Lager board" |
| depends on ARCH_R8A7790 |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index 2bc1a45d0d00..ccb056327fd4 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -70,7 +70,6 @@ obj-$(CONFIG_MACH_BOCKW) += board-bockw.o |
| obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o |
| obj-$(CONFIG_MACH_GENMAI) += board-genmai.o |
| obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |
| -obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o |
| obj-$(CONFIG_MACH_LAGER) += board-lager.o |
| obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
| obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o |
| 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) |
| -- |
| 2.1.2 |
| |
