| From 9eff15d24d92ae14c9c328b9f2c32b4603230e55 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 11 Dec 2013 15:13:57 +0100 |
| Subject: ARM: shmobile: Remove non-multiplatform Koelsch reference support |
| |
| Now that r8a7791 has CCF support remove the legacy Koelsch reference |
| Kconfig bits CONFIG_MACH_KOELSCH_REFERENCE for the non-multiplatform |
| case. |
| |
| Starting from this commit Koelsch board support is always enabled via |
| CONFIG_MACH_KOELSCH, and CONFIG_ARCH_MULTIPLATFORM is used to select |
| between board-koelsch.c and board-koelsch-reference.c |
| |
| The file board-koelsch-reference.c can no longer be used together with |
| the legacy sh-clk clock framework, instead CCF is used. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| [horms+renesas@verge.net.au: Dropped arch/arm/boot/dts/Makefile portion] |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit 469cd76b53b474e3fa235656eef4257a5134b0d8) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 11 ----------- |
| arch/arm/mach-shmobile/Makefile | 1 - |
| arch/arm/mach-shmobile/Makefile.boot | 1 - |
| 3 files changed, 13 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 88bf98011b11..338640631e08 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -268,17 +268,6 @@ config MACH_KOELSCH |
| select USE_OF |
| select MICREL_PHY if SH_ETH |
| |
| -config MACH_KOELSCH_REFERENCE |
| - bool "Koelsch board - Reference Device Tree Implementation" |
| - depends on ARCH_R8A7791 |
| - select USE_OF |
| - ---help--- |
| - Use reference implementation of Koelsch 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_KZM9G |
| bool "KZM-A9-GT board" |
| depends on ARCH_SH73A0 |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index fad94ee57d66..fe7d4ff706e4 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -74,7 +74,6 @@ obj-$(CONFIG_MACH_LAGER) += board-lager.o |
| obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
| obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o |
| obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o |
| -obj-$(CONFIG_MACH_KOELSCH_REFERENCE) += board-koelsch-reference.o |
| obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o |
| obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o |
| endif |
| diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot |
| index f6d5119eaf50..99455ecafa05 100644 |
| --- a/arch/arm/mach-shmobile/Makefile.boot |
| +++ b/arch/arm/mach-shmobile/Makefile.boot |
| @@ -9,7 +9,6 @@ loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 |
| loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000 |
| loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000 |
| loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 |
| -loadaddr-$(CONFIG_MACH_KOELSCH_REFERENCE) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 |
| loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 |
| loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 |
| -- |
| 1.8.5.rc3 |
| |
