diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-11 09:13:57 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 05:08:26 -0500 |
commit | 469cd76b53b474e3fa235656eef4257a5134b0d8 (patch) | |
tree | 8574de10b3de4f8d71cb7269aae4c63900b07368 | |
parent | a8325d627fdd688de0b50e9edf4ed3787c6b5ee5 (diff) |
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>
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 11 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile.boot | 1 |
3 files changed, 0 insertions, 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 | |||
268 | select USE_OF | 268 | select USE_OF |
269 | select MICREL_PHY if SH_ETH | 269 | select MICREL_PHY if SH_ETH |
270 | 270 | ||
271 | config MACH_KOELSCH_REFERENCE | ||
272 | bool "Koelsch board - Reference Device Tree Implementation" | ||
273 | depends on ARCH_R8A7791 | ||
274 | select USE_OF | ||
275 | ---help--- | ||
276 | Use reference implementation of Koelsch board support | ||
277 | which makes use of device tree at the expense | ||
278 | of not supporting a number of devices. | ||
279 | |||
280 | This is intended to aid developers | ||
281 | |||
282 | config MACH_KZM9G | 271 | config MACH_KZM9G |
283 | bool "KZM-A9-GT board" | 272 | bool "KZM-A9-GT board" |
284 | depends on ARCH_SH73A0 | 273 | 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 | |||
74 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o | 74 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
75 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o | 75 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o |
76 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o | 76 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o |
77 | obj-$(CONFIG_MACH_KOELSCH_REFERENCE) += board-koelsch-reference.o | ||
78 | obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o | 77 | obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o |
79 | obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o | 78 | obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o |
80 | endif | 79 | 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 | |||
9 | loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000 | 9 | loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000 |
10 | loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000 | 10 | loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000 |
11 | loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 | 11 | loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 |
12 | loadaddr-$(CONFIG_MACH_KOELSCH_REFERENCE) += 0x40008000 | ||
13 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 | 12 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 |
14 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 | 13 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 |
15 | loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 | 14 | loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 |