Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: Paul 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

authored by

Quentin Schulz and committed by
Paul Burton
39249d77 116edf6e

+21 -4
+3 -3
arch/mips/generic/Kconfig
··· 65 65 Enable this to include the FDT for the MIPSfpga platform 66 66 from Imagination Technologies in the FIT kernel image. 67 67 68 - config FIT_IMAGE_FDT_OCELOT_PCB123 69 - bool "Include FDT for Microsemi Ocelot PCB123" 68 + config FIT_IMAGE_FDT_OCELOT 69 + bool "Include FDT for Microsemi Ocelot development platforms" 70 70 select MSCC_OCELOT 71 71 help 72 - Enable this to include the FDT for the Ocelot PCB123 platform 72 + Enable this to include the FDT for the Ocelot development platforms 73 73 from Microsemi in the FIT kernel image. 74 74 This requires u-boot on the platform. 75 75
+1 -1
arch/mips/generic/Platform
··· 16 16 its-y := vmlinux.its.S 17 17 its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S 18 18 its-$(CONFIG_FIT_IMAGE_FDT_NI169445) += board-ni169445.its.S 19 - its-$(CONFIG_FIT_IMAGE_FDT_OCELOT_PCB123) += board-ocelot_pcb123.its.S 19 + its-$(CONFIG_FIT_IMAGE_FDT_OCELOT) += board-ocelot.its.S 20 20 its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += board-xilfpga.its.S
+17
arch/mips/generic/board-ocelot_pcb123.its.S arch/mips/generic/board-ocelot.its.S
··· 11 11 algo = "sha1"; 12 12 }; 13 13 }; 14 + 15 + fdt@ocelot_pcb120 { 16 + description = "MSCC Ocelot PCB120 Device Tree"; 17 + data = /incbin/("boot/dts/mscc/ocelot_pcb120.dtb"); 18 + type = "flat_dt"; 19 + arch = "mips"; 20 + compression = "none"; 21 + hash@0 { 22 + algo = "sha1"; 23 + }; 24 + }; 14 25 }; 15 26 16 27 configurations { ··· 29 18 description = "Ocelot Linux kernel"; 30 19 kernel = "kernel@0"; 31 20 fdt = "fdt@ocelot_pcb123"; 21 + }; 22 + 23 + conf@ocelot_pcb120 { 24 + description = "Ocelot Linux kernel"; 25 + kernel = "kernel@0"; 26 + fdt = "fdt@ocelot_pcb120"; 32 27 }; 33 28 }; 34 29 };