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 05c14070cc1c5a317aeb0fd77594fd502680de69..ce200a1fff38a91755f0de9d861d74215d1ba417 100644 (file)
--- 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 e1c4bc21362f2e80298a7c1d04169a01fdcacb7d..0cbc4eb5b16021d22bcadd5206eaec49c85774dd 100755 (executable)
--- 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 50cc44058f3d5c361775b7e1c1003bfb46f11452..e649c7ef49b98061dd22e6e37db108f93f7c563f 100644 (file)
--- 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 bf19a4c570c2a3f69463b12b9e056a7221b70867..a08f2331704c82c76f2dbf95c7d115813a86333a 100755 (executable)
--- 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 3181da2ca20136a7a508203203aab0aa82301bea..2d4a13f531dd61fd84009c78e549bc4b1656d401 100755 (executable)
--- 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|\