From: Mathias Kresin <dev@kresin.me>
Date: Thu, 16 Nov 2017 21:58:23 +0000 (+0100)
Subject: ramips: drop LinkIt Smart 7688 Duo userspace support
X-Git-Tag: v18.06.0-rc1~1510
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=224d4a96dd403b9e23d30c185031c17aa00cbf5a;p=oweals%2Fopenwrt.git

ramips: drop LinkIt Smart 7688 Duo userspace support

The  LinkIt Smart 7688/LinkIt Smart 7688 Duo are identical beside the
extra ATmega32U4 - accessible via UART - on the the Duo.

Since all relevant hardware is identical, drop the Duo special handling
in userspace.

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

diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
index 05c14070cc..ce200a1fff 100644
--- a/package/boot/uboot-envtools/files/ramips
+++ b/package/boot/uboot-envtools/files/ramips
@@ -20,7 +20,6 @@ all5002)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000"
 	;;
 linkits7688|\
-linkits7688d|\
 miwifi-nano|\
 sk-wb8|\
 wsr-1166|\
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index e1c4bc2136..0cbc4eb5b1 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -49,7 +49,6 @@ ramips_setup_interfaces()
 	dcs-930l-b1|\
 	ht-tm02|\
 	linkits7688 | \
-	linkits7688d | \
 	m2m|\
 	microwrt|\
 	mpr-a2|\
@@ -425,8 +424,7 @@ ramips_setup_macs()
 	kng_rc)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
-	linkits7688 | \
-	linkits7688d)
+	linkits7688)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(mtd_get_mac_binary factory 46)
 		;;
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 50cc44058f..e649c7ef49 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -170,8 +170,7 @@ get_status_led() {
 	miwifi-nano)
 		status_led="$board:blue:status"
 		;;
-	linkits7688| \
-	linkits7688d)
+	linkits7688)
 		[ "$1" = "upgrade" ] && status_led="mediatek:orange:wifi"
 		;;
 	m2m)
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index bf19a4c570..a08f233170 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -278,13 +278,7 @@ ramips_board_detect() {
 		name="m4-8M"
 		;;
 	*"MediaTek LinkIt Smart 7688")
-		linkit="$(dd bs=1 skip=1024 count=12 if=/dev/mtd2 2> /dev/null)"
-		if [ "${linkit}" = "LINKITS7688D" ]; then
-			name="linkits7688d"
-			RAMIPS_MODEL="${machine} DUO"
-		else
-			name="linkits7688"
-		fi
+		name="linkits7688"
 		;;
 	*"Memory 2 Move")
 		name="m2m"
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 3181da2ca2..2d4a13f531 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -81,7 +81,6 @@ platform_check_image() {
 	kn_rf|\
 	kng_rc|\
 	linkits7688|\
-	linkits7688d|\
 	m2m|\
 	m3|\
 	m4-4M|\