ramips: fix Mercury MAC1200R v2.0 board name

With d2b6bf141662 ("ramips: fix image validation errors") the board
name was changed to fix an image validation error. But this change
wasn't applied to all other files using the board name, which broke
sysupgrade.

Revert this change and use the former board name in the metadata
instead.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index e642d568c46f4ae547a6d3c7ba6ff032bb22fc8a..17ada648931f16d3e85630dd341defb89ba50d6f 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -272,7 +272,7 @@ ramips_board_detect() {
                name="m2m"
                ;;
        *"Mercury MAC1200R v2")
                name="m2m"
                ;;
        *"Mercury MAC1200R v2")

-               name="mac1200r-v2"
+               name="mac1200rv2"

                ;;
        *"MicroWRT")
                name="microwrt"
                ;;
        *"MicroWRT")
                name="microwrt"

diff --git a/target/linux/ramips/image/mt7628.mk b/target/linux/ramips/image/mt7628.mk
index 4502588c80ee90b22cadd3f21c6f044b9a368090..12c3c8050797adfb3bc96441d379529f7816c5d3 100644 (file)
--- a/target/linux/ramips/image/mt7628.mk
+++ b/target/linux/ramips/image/mt7628.mk
@@ -53,5 +53,6 @@ TARGET_DEVICES += duzun-dm06
 define Device/mac1200r-v2
   DTS := MAC1200RV2
   DEVICE_TITLE := Mercury MAC1200R v2.0
 define Device/mac1200r-v2
   DTS := MAC1200RV2
   DEVICE_TITLE := Mercury MAC1200R v2.0

+  SUPPORTED_DEVICES := mac1200rv2

 endef
 TARGET_DEVICES += mac1200r-v2
 endef
 TARGET_DEVICES += mac1200r-v2