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

Unverified Commit d5be4aeb authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Paul Burton
Browse files

mips: mscc: build FIT image for Ocelot 



Ocelot now has a u-boot port, allow building FIT images instead of relying
on the legacy detection and builtin DTB.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: default avatarJames Hogan <jhogan@kernel.org>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19632/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
parent 840267e4

arch/mips/boot/dts/mscc/Makefile

+1 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_LEGACY_BOARD_OCELOT)	+= ocelot_pcb123.dtb

dtb-$(CONFIG_MSCC_OCELOT)	+= ocelot_pcb123.dtb



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

arch/mips/generic/Kconfig

+10 −2
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ config LEGACY_BOARD_OCELOT 
	depends on LEGACY_BOARD_SEAD3=n

	select LEGACY_BOARDS

	select MSCC_OCELOT

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250



config MSCC_OCELOT

	bool

	select GPIOLIB

	select MSCC_OCELOT_IRQ

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250



comment "FIT/UHI Boards"
@@ -65,6 +65,14 @@ 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"

	select MSCC_OCELOT

	help

	  Enable this to include the FDT for the Ocelot PCB123 platform

	  from Microsemi in the FIT kernel image.

	  This requires u-boot on the platform.



config VIRT_BOARD_RANCHU

	bool "Support Ranchu platform for Android emulator"

	help

arch/mips/generic/Platform

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +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_XILFPGA)	+= board-xilfpga.its.S

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */

/ {

	images {

		fdt@ocelot_pcb123 {

			description = "MSCC Ocelot PCB123 Device Tree";

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

			type = "flat_dt";

			arch = "mips";

			compression = "none";

			hash@0 {

				algo = "sha1";

			};

		};

	};



	configurations {

		conf@ocelot_pcb123 {

			description = "Ocelot Linux kernel";

			kernel = "kernel@0";

			fdt = "fdt@ocelot_pcb123";

		};

	};

};