From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Quentin Schulz <quentin.schulz@bootlin.com>
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
Subject: Re: [PATCH 7/7] MIPS: mscc: add PCB120 to the ocelot fitImage
Date: Fri, 14 Sep 2018 17:00:59 +0200 [thread overview]
Message-ID: <20180914150059.GS14988@piout.net> (raw)
In-Reply-To: <87ab2f80e3942dfca4eab896ba087e7b69bb7b12.1536916714.git-series.quentin.schulz@bootlin.com>
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 <quentin.schulz@bootlin.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> 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
next prev parent reply other threads:[~2018-09-14 15:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-14 9:44 [PATCH net-next 0/7] add support for VSC8584 and VSC8574 Microsemi quad-port PHYs Quentin Schulz
2018-09-14 9:44 ` [PATCH net-next 1/7] dt-bindings: net: vsc8531: add two additional LED modes for VSC8584 Quentin Schulz
2018-09-14 13:11 ` Andrew Lunn
2018-09-15 21:34 ` Florian Fainelli
2018-09-14 9:44 ` [PATCH net-next 2/7] net: phy: mscc: add support for VSC8584 PHY Quentin Schulz
2018-09-14 13:18 ` Andrew Lunn
2018-09-14 13:29 ` Quentin Schulz
2018-09-14 16:28 ` Quentin Schulz
2018-09-14 16:58 ` Andrew Lunn
2018-10-01 9:16 ` Quentin Schulz
2018-09-14 17:27 ` Andrew Lunn
2018-10-01 9:15 ` Quentin Schulz
2018-09-14 9:44 ` [PATCH net-next 3/7] net: phy: mscc: split config_init in two functions for VSC8584 Quentin Schulz
2018-09-14 17:57 ` Florian Fainelli
2018-10-01 9:07 ` Quentin Schulz
2018-09-14 9:44 ` [PATCH net-next 4/7] net: phy: mscc: add support for VSC8574 PHY Quentin Schulz
2018-09-14 20:26 ` Florian Fainelli
2018-10-04 9:45 ` Quentin Schulz
2018-10-04 12:53 ` Quentin Schulz
2018-09-14 9:44 ` [PATCH 5/7] MIPS: mscc: ocelot: add GPIO4 pinmuxing DT node Quentin Schulz
2018-09-14 14:54 ` Alexandre Belloni
2018-09-14 16:26 ` Quentin Schulz
2018-09-14 17:02 ` Andrew Lunn
2018-10-01 9:01 ` Quentin Schulz
2018-09-14 18:02 ` Alexandre Belloni
2018-10-01 9:02 ` Quentin Schulz
2018-09-14 9:44 ` [PATCH 6/7] MIPS: mscc: add DT for Ocelot PCB120 Quentin Schulz
2018-09-14 14:58 ` Alexandre Belloni
2018-09-14 9:44 ` [PATCH 7/7] MIPS: mscc: add PCB120 to the ocelot fitImage Quentin Schulz
2018-09-14 15:00 ` Alexandre Belloni [this message]
2018-09-20 21:38 ` [PATCH net-next 0/7] add support for VSC8584 and VSC8574 Microsemi quad-port PHYs Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180914150059.GS14988@piout.net \
--to=alexandre.belloni@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=andrew@lunn.ch \
--cc=antoine.tenart@bootlin.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=quentin.schulz@bootlin.com \
--cc=ralf@linux-mips.org \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).