From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Subject: Re: [PATCH 7/7] MIPS: mscc: add PCB120 to the ocelot fitImage Date: Fri, 14 Sep 2018 17:00:59 +0200 Message-ID: <20180914150059.GS14988@piout.net> References: <87ab2f80e3942dfca4eab896ba087e7b69bb7b12.1536916714.git-series.quentin.schulz@bootlin.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, davem@davemloft.net, andrew@lunn.ch, f.fainelli@gmail.com, allan.nielsen@microchip.com, linux-mips@linux-mips.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, thomas.petazzoni@bootlin.com, antoine.tenart@bootlin.com To: Quentin Schulz Return-path: Content-Disposition: inline In-Reply-To: <87ab2f80e3942dfca4eab896ba087e7b69bb7b12.1536916714.git-series.quentin.schulz@bootlin.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 14/09/2018 11:44:28+0200, Quentin Schulz wrote: > PCB120 and PCB123 are both development boards based on Microsemi Ocelot > so let's use the same fitImage for both. > > Signed-off-by: Quentin Schulz Reviewed-by: Alexandre Belloni > --- > arch/mips/generic/Kconfig | 6 +-- > arch/mips/generic/Platform | 2 +- > arch/mips/generic/board-ocelot.its.S | 40 ++++++++++++++++++++++- > arch/mips/generic/board-ocelot_pcb123.its.S | 23 +------------- > 4 files changed, 44 insertions(+), 27 deletions(-) > create mode 100644 arch/mips/generic/board-ocelot.its.S > delete mode 100644 arch/mips/generic/board-ocelot_pcb123.its.S > > diff --git a/arch/mips/generic/Kconfig b/arch/mips/generic/Kconfig > index 08e33c6..fd60198 100644 > --- a/arch/mips/generic/Kconfig > +++ b/arch/mips/generic/Kconfig > @@ -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. > > diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform > index 879cb80..eaa19d1 100644 > --- a/arch/mips/generic/Platform > +++ b/arch/mips/generic/Platform > @@ -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 > diff --git a/arch/mips/generic/board-ocelot.its.S b/arch/mips/generic/board-ocelot.its.S > new file mode 100644 > index 0000000..3da2398 > --- /dev/null > +++ b/arch/mips/generic/board-ocelot.its.S > @@ -0,0 +1,40 @@ > +/* 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"; > + }; > + }; > + > + 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 { > + conf@ocelot_pcb123 { > + description = "Ocelot Linux kernel"; > + kernel = "kernel@0"; > + fdt = "fdt@ocelot_pcb123"; > + }; > + > + conf@ocelot_pcb120 { > + description = "Ocelot Linux kernel"; > + kernel = "kernel@0"; > + fdt = "fdt@ocelot_pcb120"; > + }; > + }; > +}; > diff --git a/arch/mips/generic/board-ocelot_pcb123.its.S b/arch/mips/generic/board-ocelot_pcb123.its.S > deleted file mode 100644 > index 5a7d5e1..0000000 > --- a/arch/mips/generic/board-ocelot_pcb123.its.S > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* 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"; > - }; > - }; > -}; > -- > git-series 0.9.1 -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com