mediatek: filogic: bpi-r3-mini: fix NAND flash layout

Fix NAND flash layout which was out-of-sync with the definition in
ARM TrustedFirmware-A which expects UBI to start at 0x200000.

Fixes: b03d3644cf ("mediatek: filogic: add BananaPi BPi-R3 mini")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch
index 5df81ae7a178352e3dd48e2f85ad02a557287558..5a7e0c4daf6c78acb7900dd7e780bf6905184d62 100644 (file)
--- a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch
+++ b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch
@@ -758,12 +758,12 @@
 +
 +                      partition@0 {
 +                              label = "bl2";
-+                              reg = <0x0 0x80000>;
++                              reg = <0x0 0x200000>;
 +                      };
 +
-+                      partition@80000 {
++                      partition@200000 {
 +                              label = "ubi";
-+                              reg = <0x80000 0x7f80000>;
++                              reg = <0x200000 0x7e00000>;
 +                      };
 +              };
 +      };

diff --git a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
index cbd742f7c0c9c12056840143dd5f94608a3c35dc..b83ebecf1540797f607768c9dff347bf392ffa63 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
+++ b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
@@ -507,13 +507,13 @@
 
                        partition@0 {
                                label = "bl2";
-                               reg = <0x00000 0x100000>;
+                               reg = <0x0 0x200000>;
                                read-only;
                        };
 
-                       partition@100000 {
+                       partition@200000 {
                                label = "ubi";
-                               reg = <0x100000 0x7f00000>;
+                               reg = <0x200000 0x7e00000>;
                                compatible = "linux,ubi";
 
                                volumes {