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

diff --git a/arch/mips/generic/Kconfig b/arch/mips/generic/Kconfig
index 08e33c6b2539c9bfd4225f84df2390467e601920..fd6019802657a27d07d65a7760fd92e9a0871e03 100644 (file)
--- 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 879cb80396c88e57b07fdd9e4474971c284148c2..eaa19d1893243c52539b03bc2486ecc13331c482 100644 (file)
--- 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_pcb123.its.S b/arch/mips/generic/board-ocelot.its.S
similarity index 55%
rename from arch/mips/generic/board-ocelot_pcb123.its.S
rename to arch/mips/generic/board-ocelot.its.S
index 5a7d5e1c878aff5df0a7f44f18512cd30c1cb38c..3da23988149a66e0fec419f2fee93108d4fce64a 100644 (file)
--- a/arch/mips/generic/board-ocelot_pcb123.its.S
+++ b/arch/mips/generic/board-ocelot.its.S
@@ -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";
+               };
        };
 };