[openwrt/openwrt] uboot-envtools: add support for Aruba AP-303 and AP-365

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6738b5e2ac80ec7bcaaa47edf20d9b479550ed8e

commit 6738b5e2ac80ec7bcaaa47edf20d9b479550ed8e
Author: Jan Alexander <jan at nalx.net>
AuthorDate: Sat Jan 9 11:33:34 2021 +0100

    uboot-envtools: add support for Aruba AP-303 and AP-365
    
    Both devices use u-boot env variables to boot OpenWrt from its flash
    partition. Using u-boot envtools, it is possible to change the bootcmd
    back to the stock firmware partition directly from OpenWrt without
    attaching a serial cable or even physically accessing the device.
    
    Signed-off-by: Jan Alexander <jan at nalx.net>
---
 package/boot/uboot-envtools/files/ipq40xx                           | 6 ++++++
 .../linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts   | 2 --
 .../linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts   | 1 -
 target/linux/ipq40xx/image/Makefile                                 | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
index 8a0de7a548..b24cbf979e 100644
--- a/package/boot/uboot-envtools/files/ipq40xx
+++ b/package/boot/uboot-envtools/files/ipq40xx
@@ -43,6 +43,12 @@ plasmacloud,pa1200 |\
 plasmacloud,pa2200)
 	ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x10000" "0x10000"
 	;;
+aruba,ap-303)
+	ubootenv_add_uci_config "/dev/mtd13" "0x0" "0x10000" "0x10000"
+	;;
+aruba,ap-365)
+	ubootenv_add_uci_config "/dev/mtd8" "0x0" "0x10000" "0x10000"
+	;;
 buffalo,wtr-m2133hp)
 	ubootenv_add_uci_config "/dev/mtd8" "0x0" "0x40000" "0x20000"
 	;;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
index a3cecddd6e..13f89d810c 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
@@ -145,10 +145,8 @@
 			};
 
 			partition at 380000 {
-				/* This is empty */
 				label = "appsblenv";
 				reg = <0x380000 0x10000>;
-				read-only;
 			};
 
 			partition at 390000 {
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
index 1d4e50292e..988a4421b5 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
@@ -138,7 +138,6 @@
 			partition at e0000 {
 				label = "u-boot-env";
 				reg = <0xe0000 0x10000>;
-				read-only;
 			};
 
 			partition at f0000 {
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index c19dcb4039..f10ff002dc 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -156,6 +156,7 @@ endef
 define Device/aruba_ap-303
 	$(call Device/aruba_glenmorangie)
 	DEVICE_MODEL := AP-303
+	DEVICE_PACKAGES += uboot-envtools
 endef
 TARGET_DEVICES += aruba_ap-303
 
@@ -168,7 +169,7 @@ TARGET_DEVICES += aruba_ap-303h
 define Device/aruba_ap-365
 	$(call Device/aruba_glenmorangie)
 	DEVICE_MODEL := AP-365
-	DEVICE_PACKAGES += kmod-hwmon-ad7418
+	DEVICE_PACKAGES += kmod-hwmon-ad7418 uboot-envtools
 endef
 TARGET_DEVICES += aruba_ap-365