Commit a8325d62 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Simon Horman
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent f31239ef

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ 
	r8a7779-marzen-reference.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

	r8a7790-lager-reference.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb \

	r8a73a4-ape6evm.dtb \

arch/arm/mach-shmobile/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -262,17 +262,6 @@ config MACH_LAGER 
	depends on ARCH_R8A7790

	select USE_OF



config MACH_LAGER_REFERENCE

	bool "Lager board - Reference Device Tree Implementation"

	depends on ARCH_R8A7790

	select USE_OF

	---help---

	   Use reference implementation of Lager 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_KOELSCH

	bool "Koelsch board"

	depends on ARCH_R8A7791

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ obj-$(CONFIG_MACH_GENMAI_REFERENCE) += board-genmai-reference.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_LAGER_REFERENCE)	+= board-lager-reference.o

obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o

obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o

obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch.o

arch/arm/mach-shmobile/Makefile.boot

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ loadaddr-$(CONFIG_MACH_KOELSCH_REFERENCE) += 0x40008000 
loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000

loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000

loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000

loadaddr-$(CONFIG_MACH_LAGER_REFERENCE) += 0x40008000

loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000

loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000

loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000

CRA Git | Maintained and supported by SUSTech CRA and CCSE