[openwrt/openwrt] ramips: use OKLI loader for TP-Link RE200 v1 and RE210 v1

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/1efcdb2446602c3b120b265c1d189039fdb9c0e7

commit 1efcdb2446602c3b120b265c1d189039fdb9c0e7
Author: Shiji Yang <yangshiji66 at qq.com>
AuthorDate: Tue Sep 24 18:50:01 2024 +0800

    ramips: use OKLI loader for TP-Link RE200 v1 and RE210 v1
    
    Using OKLI image to fix the booting stuck issue.
    
    Tested with u-boot extracted from TP-Link stock images
    "RE200(EU)_V1_171206.zip" and "RE210(US_CA)_V1_171205.zip".
    
    Fixes: https://github.com/openwrt/openwrt/issues/16296
    Signed-off-by: Shiji Yang <yangshiji66 at qq.com>
    Link: https://github.com/openwrt/openwrt/pull/16473
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit b62e6f5beb2a574c67ba5159f0049e54cdf25d69)
---
 target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi | 5 ++++-
 target/linux/ramips/image/mt7620.mk                  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi b/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
index e6d9b8576d..adb383f3c5 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
+++ b/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
 	aliases {
@@ -51,9 +52,11 @@
 			};
 
 			partition at 20000 {
-				compatible = "tplink,firmware";
+				compatible = "openwrt,uimage", "denx,uimage";
 				label = "firmware";
 				reg = <0x20000 0x7c0000>;
+				openwrt,offset = <0x1000>;
+				openwrt,ih-magic = <IH_MAGIC_OKLI>;
 			};
 
 			partition at 7e0000 {
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 61b79c962d..f7ef1c4832 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -1245,7 +1245,7 @@ endef
 TARGET_DEVICES += tplink_archer-mr200
 
 define Device/tplink_re200-v1
-  $(Device/tplink-v1)
+  $(Device/tplink-v1-okli)
   SOC := mt7620a
   DEVICE_MODEL := RE200
   DEVICE_VARIANT := v1
@@ -1257,7 +1257,7 @@ endef
 TARGET_DEVICES += tplink_re200-v1
 
 define Device/tplink_re210-v1
-  $(Device/tplink-v1)
+  $(Device/tplink-v1-okli)
   SOC := mt7620a
   DEVICE_MODEL := RE210
   DEVICE_VARIANT := v1