|
|
|
|
From 3217cdfe8a3eae76fafbebbe407be5985a7fd4c2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tomasz Maciej Nowak <tmn505@gmail.com>
|
|
|
|
|
Date: Mon, 31 Dec 2018 14:18:50 +0100
|
|
|
|
|
Subject: [PATCH] arm64: dts: armada-3720-espressobin: correct spi node
|
|
|
|
|
|
|
|
|
|
The manufacturer of this board, ships it with various SPI NOR chips and
|
|
|
|
|
increments U-Boot bootloader version along the time. There is no way to
|
|
|
|
|
tell which is placed on the board since no revision bump takes place.
|
|
|
|
|
This creates two issues.
|
|
|
|
|
|
|
|
|
|
The first, cosmetic. Since the SPI chip may differ, there's message on
|
|
|
|
|
boot stating that kernel expected w25q32dw and found different one. To
|
|
|
|
|
correct this, remove optional device-specific compatible string. Being
|
|
|
|
|
here lets replace bogus "spi-flash" string with proper one.
|
|
|
|
|
|
|
|
|
|
The second is linked to partitions layout, it changed after commit [1]
|
|
|
|
|
in Marvells downstream U-Boot fork, shifting environment location to the
|
|
|
|
|
end of boot device. Since the new boards can have U-Boot with this
|
|
|
|
|
change it can lead to improper results writing or reading from these
|
|
|
|
|
partitions. We can't tell if users will update bootloader to recent
|
|
|
|
|
version, so let's drop current layout.
|
|
|
|
|
|
|
|
|
|
1. https://github.com/MarvellEmbeddedProcessors/u-boot-marvell/commit/81e7251252aefe1a6b829ed05f3586320cb45372
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
.../dts/marvell/armada-3720-espressobin.dts | 18 +-----------------
|
|
|
|
|
1 file changed, 1 insertion(+), 17 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
|
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
|
|
|
@@ -123,25 +123,9 @@
|
|
|
|
|
|
|
|
|
|
flash@0 {
|
|
|
|
|
reg = <0>;
|
|
|
|
|
- compatible = "winbond,w25q32dw", "jedec,spi-flash";
|
|
|
|
|
+ compatible = "jedec,spi-nor";
|
|
|
|
|
spi-max-frequency = <104000000>;
|
|
|
|
|
m25p,fast-read;
|
|
|
|
|
-
|
|
|
|
|
- partitions {
|
|
|
|
|
- compatible = "fixed-partitions";
|
|
|
|
|
- #address-cells = <1>;
|
|
|
|
|
- #size-cells = <1>;
|
|
|
|
|
-
|
|
|
|
|
- partition@0 {
|
|
|
|
|
- label = "uboot";
|
|
|
|
|
- reg = <0 0x180000>;
|
|
|
|
|
- };
|
|
|
|
|
-
|
|
|
|
|
- partition@180000 {
|
|
|
|
|
- label = "ubootenv";
|
|
|
|
|
- reg = <0x180000 0x10000>;
|
|
|
|
|
- };
|
|
|
|
|
- };
|
|
|
|
|
};
|
|
|
|
|
};
|
|
|
|
|
|
