ath79: dts: fortinet_loader: extract common part
authorLech Perczak <lech.perczak@gmail.com>
Wed, 26 Jul 2023 00:55:05 +0000 (02:55 +0200)
committerDavid Bauer <mail@david-bauer.net>
Fri, 3 Nov 2023 22:06:07 +0000 (23:06 +0100)
In preparation for FAP-220-B support, rename ar934x_fortinet_loader.dtsi
to arxxxx_fortinet_loader.dtsi, to avoid confusion, as FAP-220-B shares
flash layout with FAP-221-B exactly despite different SoC.

While at that, add a label to U-boot partition to allow for nvmem MAC
binding in future.

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi
target/linux/ath79/dts/ar934x_fortinet_loader.dtsi [deleted file]
target/linux/ath79/dts/arxxxx_fortinet_loader.dtsi [new file with mode: 0644]

index d5275c496e341bba36a475c4f829faaa9b240b26..c8f12a1bfbdf216a94b66d023ebec10addfe4ee3 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
 #include "ar9344.dtsi"
-#include "ar934x_fortinet_loader.dtsi"
+#include "arxxxx_fortinet_loader.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/target/linux/ath79/dts/ar934x_fortinet_loader.dtsi b/target/linux/ath79/dts/ar934x_fortinet_loader.dtsi
deleted file mode 100644 (file)
index d7cbf2e..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include <dt-bindings/mtd/partitions/uimage.h>
-
-/ {
-       virtual_flash {
-               compatible = "mtd-concat";
-
-               devices = <&fwconcat0 &fwconcat1>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               compatible = "openwrt,uimage", "denx,uimage";
-                               openwrt,ih-magic = <0x73714f4b>;
-                               label = "firmware";
-                               reg = <0x0 0x0>;
-                       };
-               };
-       };
-};
-
-&spi {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <40000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       fwconcat0: partition@40000 {
-                               label = "fwconcat0";
-                               reg = <0x040000 0x900000>;
-                       };
-
-                       partition@940000 {
-                               label = "loader";
-                               reg = <0x940000 0x010000>;
-                       };
-
-                       fwconcat1: partition@950000 {
-                               label = "fwconcat1";
-                               reg = <0x950000 0x1a0000>;
-                       };
-
-                       fwconcat2: partition@af0000 {
-                               label = "reserved";
-                               reg = <0xaf0000 0x500000>;
-                       };
-
-                       art: partition@ff0000 {
-                               label = "art";
-                               reg = <0xff0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
diff --git a/target/linux/ath79/dts/arxxxx_fortinet_loader.dtsi b/target/linux/ath79/dts/arxxxx_fortinet_loader.dtsi
new file mode 100644 (file)
index 0000000..3bc7343
--- /dev/null
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include <dt-bindings/mtd/partitions/uimage.h>
+
+/ {
+       virtual_flash {
+               compatible = "mtd-concat";
+
+               devices = <&fwconcat0 &fwconcat1>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <0x73714f4b>;
+                               label = "firmware";
+                               reg = <0x0 0x0>;
+                       };
+               };
+       };
+};
+
+&spi {
+       status = "okay";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <40000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       uboot: partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       fwconcat0: partition@40000 {
+                               label = "fwconcat0";
+                               reg = <0x040000 0x900000>;
+                       };
+
+                       partition@940000 {
+                               label = "loader";
+                               reg = <0x940000 0x010000>;
+                       };
+
+                       fwconcat1: partition@950000 {
+                               label = "fwconcat1";
+                               reg = <0x950000 0x1a0000>;
+                       };
+
+                       fwconcat2: partition@af0000 {
+                               label = "reserved";
+                               reg = <0xaf0000 0x500000>;
+                       };
+
+                       art: partition@ff0000 {
+                               label = "art";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};