aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-07-28 19:22:55 +0200
committerMathias Kresin <dev@kresin.me>2017-07-29 09:24:32 +0200
commit99f1097c0adcbe4730f86fbcdfbe7f291cdb25cf (patch)
tree36cc4077d8a39af9c580b9aefbf6f5b3e05dd278
parent45dbd65850bdaa8c2b74d164065cba12b52107f7 (diff)
downloadupstream-99f1097c0adcbe4730f86fbcdfbe7f291cdb25cf.tar.gz
upstream-99f1097c0adcbe4730f86fbcdfbe7f291cdb25cf.tar.bz2
upstream-99f1097c0adcbe4730f86fbcdfbe7f291cdb25cf.zip
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>
-rwxr-xr-xtarget/linux/ramips/base-files/lib/ramips.sh2
-rw-r--r--target/linux/ramips/image/mt7628.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 0267c9df3f..3efdeda533 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -290,7 +290,7 @@ ramips_board_detect() {
name="m2m"
;;
*"Mercury MAC1200R v2")
- name="mac1200r-v2"
+ name="mac1200rv2"
;;
*"MicroWRT")
name="microwrt"
diff --git a/target/linux/ramips/image/mt7628.mk b/target/linux/ramips/image/mt7628.mk
index fbfc37d986..693e64f4dd 100644
--- a/target/linux/ramips/image/mt7628.mk
+++ b/target/linux/ramips/image/mt7628.mk
@@ -92,6 +92,7 @@ TARGET_DEVICES += duzun-dm06
define Device/mac1200r-v2
DTS := MAC1200RV2
DEVICE_TITLE := Mercury MAC1200R v2.0
+ SUPPORTED_DEVICES := mac1200rv2
endef
TARGET_DEVICES += mac1200r-v2