Skip to contentSkip to conversation

arm64: dts: marvell: mcbin: Adding SPI-NOR Flash Config

PATCH In review Alexander Syring 3 participants 4 messages Feb 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: dts: marvell: mcbin: Adding SPI-NOR Flash Config

According to U-Boot dts file enabling the SPI-NOR flash for use in Linux

---
 .../boot/dts/marvell/armada-8040-mcbin.dtsi   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +18 -5
index 329f8ceeebea..83994ff46e2d 100644
@@ -333,11 +333,24 @@
 	status = "okay";
 
 	spi-flash@0 {
-		compatible = "st,w25q32";
-		spi-max-frequency = <50000000>;
-		reg = <0>;
-	};
-};
+		compatible = "st,w25q32", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+
+			partition@0 {
+				label = "U-Boot";
+				reg = <0 0x200000>;
+			};
+			partition@400000 {
+				label = "U-Boot Env";
+				reg = <0x200000 0xce0000>;
+			};
+		};
+	};
+};
 
 &cp1_usb3_0 {
 	/* CPS Lane 2 - CON7 */
Signature · 1 line
2.20.1
#1 lore raw
Quoted 2 lines · Alexander Syring

According to U-Boot dts file enabling the SPI-NOR flash for use in Linux

Some of us already use u-boot on Macchiatobin, and have u-boot in SPI NOR flash. The u-boot environment is stored at 0x3f0000 currently.

Merging this will break existing setups, especially when we use u-boot-tools to access the environment from within Linux.

Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
#2 lore raw
In reply to Alexander Syring
Quoted 33 lines · Alexander Syring

According to U-Boot dts file enabling the SPI-NOR flash for use in Linux

---
 .../boot/dts/marvell/armada-8040-mcbin.dtsi   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +11 -5
index 329f8ceeebea..83994ff46e2d 100644
@@ -333,11 +333,24 @@
 	status = "okay";
 
 	spi-flash@0 {
-		compatible = "st,w25q32";
-		spi-max-frequency = <50000000>;
-		reg = <0>;
-	};
-};
+		compatible = "st,w25q32", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+
+			partition@0 {
+				label = "U-Boot";
+				reg = <0 0x200000>;
+			};

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi line 356

Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +7 -0
+			partition@400000 {
+				label = "U-Boot Env";
+				reg = <0x200000 0xce0000>;
+			};
+		};
+	};
+};
 
 &cp1_usb3_0 {
 	/* CPS Lane 2 - CON7 */

Really?

My mcbin SPI flash doesn't have this partitioning, and doesn't have u-boot at all. This should be provided by the bootloader itself, and not baked into the reference DT.

Thanks,

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...
#3 lore raw
Quoted 47 lines · Marc Zyngier
Quoted 33 lines · Alexander Syring

According to U-Boot dts file enabling the SPI-NOR flash for use in Linux

---
 .../boot/dts/marvell/armada-8040-mcbin.dtsi   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +11 -5
index 329f8ceeebea..83994ff46e2d 100644
@@ -333,11 +333,24 @@
 	status = "okay";
 
 	spi-flash@0 {
-		compatible = "st,w25q32";
-		spi-max-frequency = <50000000>;
-		reg = <0>;
-	};
-};
+		compatible = "st,w25q32", "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+
+			partition@0 {
+				label = "U-Boot";
+				reg = <0 0x200000>;
+			};

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi line 356

Quoted 10 lines
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +7 -0
+			partition@400000 {
+				label = "U-Boot Env";
+				reg = <0x200000 0xce0000>;
+			};
+		};
+	};
+};
 
 &cp1_usb3_0 {
 	/* CPS Lane 2 - CON7 */

Really?

Quoted 3 lines

My mcbin SPI flash doesn't have this partitioning, and doesn't have u-boot at all. This should be provided by the bootloader itself, and not baked into the reference DT.

Exactly.

Simple solution for the above. Instead of the above, create /etc/fw_env.config with:

/dev/mtdblock0 0x200000 0x10000

Then its possible to read and write the u-boot environment using fw_printenv and fw_setenv. No partitions are required, and IMHO are pointless for such a scenario.

That will allow those of us with a different SPI flash layout and already have this in /etc/fw_env.config:

/dev/mtdblock0 0x3f0000 0x10000

to not experience any breakage.

Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up