From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 16 Feb 2024 05:38:07 +0000 (+0000)
Subject: mediatek: filogic: bpi-r3-mini: fix NAND flash layout
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ae1c0f1b158a881043af460ed7a94e2177cdea2a;p=openwrt%2Fstaging%2Fnbd.git

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 5df81ae7a1..5a7e0c4daf 100644
--- 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 cbd742f7c0..b83ebecf15 100644
--- 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 {