apm821xx: mx60: increment compat_version

meraki_loadaddr=1000000 may not enough to boot openwrt 25.12+ on mx60,
so directly sysupgrade without changing meraki_loadaddr would result
broken, but the u-boot-env partition used to be marked read-only, so
compat_version had better be incremented to show a notification to
direct users to the wiki to prepare the sysupgrade manually.

Signed-off-by: Edward Chow <equu@openmail.cc>
Link: https://github.com/openwrt/openwrt/pull/21912
(cherry picked from commit 17cd653d5f28c6579aea1a0afb86ea94f80f725d)
Link: https://github.com/openwrt/openwrt/pull/22339
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/apm821xx/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/apm821xx/base-files/etc/uci-defaults/05_fix-compat-version
index 11af63c9e7ce28cb449375a145d90c20a6990de0..0324aa3cc35fd94957b07652375b2db9b41b5a88 100644 (file)
--- a/target/linux/apm821xx/base-files/etc/uci-defaults/05_fix-compat-version
+++ b/target/linux/apm821xx/base-files/etc/uci-defaults/05_fix-compat-version
@@ -1,7 +1,10 @@
 . /lib/functions.sh
 
 case "$(board_name)" in
-meraki,mx60|\
+meraki,mx60)
+       uci set system.@system[0].compat_version="3.1"
+       uci commit system
+       ;;
 netgear,wndr4700)
        uci set system.@system[0].compat_version="3.0"
        uci commit system

diff --git a/target/linux/apm821xx/image/nand.mk b/target/linux/apm821xx/image/nand.mk
index ced313f0875a26f11ef30b26386cf6547483c6aa..a5506c7a16e43bd01e34ec1520c00da4e4b1d1a2 100644 (file)
--- a/target/linux/apm821xx/image/nand.mk
+++ b/target/linux/apm821xx/image/nand.mk
@@ -50,10 +50,10 @@ define Device/meraki_mx60
   KERNEL := kernel-bin | libdeflate-gzip | MuImage-initramfs gzip
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
-  DEVICE_COMPAT_VERSION := 3.0
-  DEVICE_COMPAT_MESSAGE := uboot's bootcmd has to be updated to support standard multi-image uImages. \
-       Network swconfig configuration cannot be upgraded to DSA. \
-       Upgrade via sysupgrade mechanism is not possible.
+  DEVICE_COMPAT_VERSION := 3.1
+  DEVICE_COMPAT_MESSAGE := meraki_loadaddr of u-boot has to be adjusted before upgrade \
+       to boot properly. Query https://openwrt.org/toh/meraki/mx60#upgrading_to_v2512 \
+       for detail.
 endef
 TARGET_DEVICES += meraki_mx60