Re: [PATCH u-boot-marvell 7/9] arm: a37xx: espressobin: Move U-Boot specific partitions node to -u-boot.dtsi

[Stefan Roese]

On 2/14/22 11:34, Pali Rohár wrote:

U-Boot specific changes should be in armada-3720-espressobin-u-boot.dtsi DTS 
file.

Signed-off-by: Pali Rohár <p...@kernel.org>

Reviewed-by: Stefan Roese <s...@denx.de>

Thanks,
Stefan

---
  .../dts/armada-3720-espressobin-u-boot.dtsi   | 23 +++++++++++++++++++
  arch/arm/dts/armada-3720-espressobin.dts      | 18 ---------------
  2 files changed, 23 insertions(+), 18 deletions(-)
  create mode 100644 arch/arm/dts/armada-3720-espressobin-u-boot.dtsi

diff --git a/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi 
b/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi
new file mode 100644
index 000000000000..7ec3392201bd
--- /dev/null
+++ b/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
+&spi0 {
+       spi-flash@0 {
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@firmware {
+                               reg = <0 CONFIG_ENV_OFFSET>;
+                               label = "firmware";
+                       };
+
+                       partition@u-boot-env {
+                               reg = <CONFIG_ENV_OFFSET CONFIG_ENV_SIZE>;
+                               label = "u-boot-env";
+                       };
+               };
+       };
+};
+#endif
diff --git a/arch/arm/dts/armada-3720-espressobin.dts 
b/arch/arm/dts/armada-3720-espressobin.dts
index f59f82d91632..c0e0e13953b6 100644
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -147,24 +147,6 @@
                reg = <0>; /* Chip select 0 */
                spi-max-frequency = <50000000>;
                m25p,fast-read;
-
-#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@firmware {
-                               reg = <0 CONFIG_ENV_OFFSET>;
-                               label = "firmware";
-                       };
-
-                       partition@u-boot-env {
-                               reg = <CONFIG_ENV_OFFSET CONFIG_ENV_SIZE>;
-                               label = "u-boot-env";
-                       };
-               };
-#endif
        };
  };

Viele Grüße,
Stefan Roese

--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: s...@denx.de