Commit 700364da authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Thomas Bogendoerfer
Browse files

MIPS: mscc: Prepare configuration to handle more SoCs 



Ocelot belongs to a family of SoC named the VCore III. In order to add
these new Soc, use the new symbol SOC_VCOREIII instead of a one
dedicated to Ocelot.

In order to avoid regression on driver building, the MSCC_OCELOT
configuration symbol is kept until the driver will be converted.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 597fa616

arch/mips/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += img 
subdir-$(CONFIG_MACH_INGENIC)		+= ingenic

subdir-$(CONFIG_LANTIQ)			+= lantiq

subdir-$(CONFIG_MACH_LOONGSON64)	+= loongson

subdir-$(CONFIG_MSCC_OCELOT)		+= mscc

subdir-$(CONFIG_SOC_VCOREIII)		+= mscc

subdir-$(CONFIG_MIPS_MALTA)		+= mti

subdir-$(CONFIG_LEGACY_BOARD_SEAD3)	+= mti

subdir-$(CONFIG_NLM_XLP_BOARD)		+= netlogic

arch/mips/boot/dts/mscc/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

dtb-$(CONFIG_MSCC_OCELOT)	+= ocelot_pcb123.dtb ocelot_pcb120.dtb

dtb-$(CONFIG_SOC_VCOREIII)	+= ocelot_pcb123.dtb ocelot_pcb120.dtb



obj-$(CONFIG_BUILTIN_DTB)	+= $(addsuffix .o, $(dtb-y))

arch/mips/generic/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -34,14 +34,19 @@ config LEGACY_BOARD_OCELOT 
	bool "Support MSCC Ocelot boards"

	depends on LEGACY_BOARD_SEAD3=n

	select LEGACY_BOARDS

	select MSCC_OCELOT

	select SOC_VCOREIII

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250



config MSCC_OCELOT

config SOC_VCOREIII

	bool

	select GPIOLIB

	select MSCC_OCELOT_IRQ

	select MSCC_OCELOT #will be removed when driver no more use it



#Will be removed when the driver using it will be converted to SOC_VCOREIII

config MSCC_OCELOT

	bool



comment "FIT/UHI Boards"
@@ -67,7 +72,7 @@ config FIT_IMAGE_FDT_XILFPGA 


config FIT_IMAGE_FDT_OCELOT

	bool "Include FDT for Microsemi Ocelot development platforms"

	select MSCC_OCELOT

	select SOC_VCOREIII

	help

	  Enable this to include the FDT for the Ocelot development platforms

	  from Microsemi in the FIT kernel image.