diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-11 09:13:56 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 05:08:26 -0500 |
commit | a8325d627fdd688de0b50e9edf4ed3787c6b5ee5 (patch) | |
tree | 31836af82b6723f9f7f2c4607808a0e8429ac227 /arch/arm/mach-shmobile | |
parent | f31239ef590186b6895a2f2cf7e0f2709a5c0da0 (diff) |
ARM: shmobile: Remove non-multiplatform Lager reference support
Now that r8a7790 has CCF support remove the legacy Lager reference
Kconfig bits CONFIG_MACH_LAGER_REFERENCE for the non-multiplatform
case.
Starting from this commit Lager board support is always enabled via
CONFIG_MACH_LAGER, and CONFIG_ARCH_MULTIPLATFORM is used to select
between board-lager.c and board-lager-reference.c
The file board-lager-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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-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 e7033a858429..88bf98011b11 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -262,17 +262,6 @@ config MACH_LAGER | |||
262 | depends on ARCH_R8A7790 | 262 | depends on ARCH_R8A7790 |
263 | select USE_OF | 263 | select USE_OF |
264 | 264 | ||
265 | config MACH_LAGER_REFERENCE | ||
266 | bool "Lager board - Reference Device Tree Implementation" | ||
267 | depends on ARCH_R8A7790 | ||
268 | select USE_OF | ||
269 | ---help--- | ||
270 | Use reference implementation of Lager board support | ||
271 | which makes use of device tree at the expense | ||
272 | of not supporting a number of devices. | ||
273 | |||
274 | This is intended to aid developers | ||
275 | |||
276 | config MACH_KOELSCH | 265 | config MACH_KOELSCH |
277 | bool "Koelsch board" | 266 | bool "Koelsch board" |
278 | depends on ARCH_R8A7791 | 267 | depends on ARCH_R8A7791 |
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 9daa9c16e681..fad94ee57d66 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
@@ -71,7 +71,6 @@ obj-$(CONFIG_MACH_GENMAI_REFERENCE) += board-genmai-reference.o | |||
71 | obj-$(CONFIG_MACH_MARZEN) += board-marzen.o | 71 | obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |
72 | obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o | 72 | obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o |
73 | obj-$(CONFIG_MACH_LAGER) += board-lager.o | 73 | obj-$(CONFIG_MACH_LAGER) += board-lager.o |
74 | obj-$(CONFIG_MACH_LAGER_REFERENCE) += board-lager-reference.o | ||
75 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o | 74 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
76 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o | 75 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o |
77 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o | 76 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o |
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot index 759e4f8fcd37..f6d5119eaf50 100644 --- a/arch/arm/mach-shmobile/Makefile.boot +++ b/arch/arm/mach-shmobile/Makefile.boot | |||
@@ -13,7 +13,6 @@ loadaddr-$(CONFIG_MACH_KOELSCH_REFERENCE) += 0x40008000 | |||
13 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 | 13 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 |
14 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 | 14 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 |
15 | loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 | 15 | loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 |
16 | loadaddr-$(CONFIG_MACH_LAGER_REFERENCE) += 0x40008000 | ||
17 | loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 | 16 | loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 |
18 | loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 | 17 | loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 |
19 | loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000 | 18 | loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000 |