Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df8ee58d authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Remove non-multiplatform KZM9D reference support 



Now when CCF is supported remove the legacy KZM9D reference
Kconfig bits CONFIG_MACH_KZM9D_REFERENCE for the non-multiplatform
case.

Starting from this commit KZM9D board support is always enabled
via CONFIG_MACH_KZM9D, and CONFIG_ARCH_MULTIPLATFORM is used
to select between board-kzm9d.c and board-kzm9d-reference.c

The file board-kzm9d-reference.c can no longer be used together
with the legacy sh-clk clock framework, instead CCF is used.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 3ae970a6

arch/arm/mach-shmobile/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -237,18 +237,6 @@ config MACH_KZM9D 
	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF



config MACH_KZM9D_REFERENCE

	bool "KZM9D board - Reference Device Tree Implementation"

	depends on ARCH_EMEV2

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF

	---help---

	   Use reference implementation of KZM9D board support

	   which makes a greater 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

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 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_KZM9D)	+= board-kzm9d.o

obj-$(CONFIG_MACH_KZM9D_REFERENCE)	+= board-kzm9d-reference.o

obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o

obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o

endif

arch/arm/mach-shmobile/Makefile.boot

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 
loadaddr-$(CONFIG_MACH_GENMAI) += 0x8008000

loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000

loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000

loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000

loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000

loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000

loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000