Unverified Commit 39249d77 authored by Quentin Schulz's avatar Quentin Schulz Committed by Paul Burton
Browse files

MIPS: mscc: add PCB120 to the ocelot fitImage 



PCB120 and PCB123 are both development boards based on Microsemi Ocelot
so let's use the same fitImage for both.

Reviewed-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20871/
Cc: ralf@linux-mips.org
Cc: jhogan@kernel.org
Cc: robh+dt@kernel.org
Cc: mark.rutland@arm.com
Cc: davem@davemloft.net
Cc: andrew@lunn.ch
Cc: f.fainelli@gmail.com
Cc: allan.nielsen@microchip.com
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: thomas.petazzoni@bootlin.com
Cc: antoine.tenart@bootlin.com
parent 116edf6e

arch/mips/generic/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ config FIT_IMAGE_FDT_XILFPGA 
	  Enable this to include the FDT for the MIPSfpga platform

	  from Imagination Technologies in the FIT kernel image.



config FIT_IMAGE_FDT_OCELOT_PCB123

	bool "Include FDT for Microsemi Ocelot PCB123"

config FIT_IMAGE_FDT_OCELOT

	bool "Include FDT for Microsemi Ocelot development platforms"

	select MSCC_OCELOT

	help

	  Enable this to include the FDT for the Ocelot PCB123 platform

	  Enable this to include the FDT for the Ocelot development platforms

	  from Microsemi in the FIT kernel image.

	  This requires u-boot on the platform.

arch/mips/generic/Platform

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb 
its-y					:= vmlinux.its.S

its-$(CONFIG_FIT_IMAGE_FDT_BOSTON)	+= board-boston.its.S

its-$(CONFIG_FIT_IMAGE_FDT_NI169445)	+= board-ni169445.its.S

its-$(CONFIG_FIT_IMAGE_FDT_OCELOT_PCB123) += board-ocelot_pcb123.its.S

its-$(CONFIG_FIT_IMAGE_FDT_OCELOT)	+= board-ocelot.its.S

its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA)	+= board-xilfpga.its.S

arch/mips/generic/board-ocelot_pcb123.its.S→arch/mips/generic/board-ocelot.its.S

+17 −0
Original line number Diff line number Diff line
@@ -11,6 +11,17 @@ 
				algo = "sha1";

			};

		};



		fdt@ocelot_pcb120 {

			description = "MSCC Ocelot PCB120 Device Tree";

			data = /incbin/("boot/dts/mscc/ocelot_pcb120.dtb");

			type = "flat_dt";

			arch = "mips";

			compression = "none";

			hash@0 {

				algo = "sha1";

			};

		};

	};



	configurations {
@@ -19,5 +30,11 @@ 
			kernel = "kernel@0";

			fdt = "fdt@ocelot_pcb123";

		};



		conf@ocelot_pcb120 {

			description = "Ocelot Linux kernel";

			kernel = "kernel@0";

			fdt = "fdt@ocelot_pcb120";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE