From 83376b6f24b3c4043428ece3b5996c234e248756 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Fri, 16 Jul 2021 12:08:26 +0800
Subject: [PATCH] ramips: adjust default packages for some devices

---
 target/linux/ramips/image/mt7621.mk                    | 10 +++++-----
 .../linux/ramips/mt7621/base-files/etc/board.d/01_leds |  6 +-----
 .../ramips/mt7621/base-files/etc/board.d/02_network    |  7 -------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index a70dc816de..aae10c8419 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -262,15 +262,15 @@ endef
 TARGET_DEVICES += cudy_wr2100
 
 define Device/dlink_dir-8xx-a1
-  IMAGE_SIZE := 16000k
+  IMAGE_SIZE := 16064k
   DEVICE_VENDOR := D-Link
-  DEVICE_PACKAGES := kmod-mt7615d luci-app-mtwifi uboot-envtools -wpad-openssl
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware
 endef
 
 define Device/dlink_dir-8xx-r1
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := D-Link
-  DEVICE_PACKAGES := kmod-mt7615d luci-app-mtwifi -wpad-openssl
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware
   KERNEL_INITRAMFS := $$(KERNEL)
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \
 	check-size | append-metadata
@@ -912,8 +912,8 @@ define Device/motorola_mr2600
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Motorola
   DEVICE_MODEL := MR2600
-  DEVICE_PACKAGES := kmod-mt7615d kmod-usb3 kmod-usb-ledtrig-usbport \
-	luci-app-mtwifi -wpad-openssl uboot-envtools
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \
+	kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += motorola_mr2600
 
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index 401c5f5a43..2484bcffd0 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -38,17 +38,13 @@ dlink,dir-853-a3)
 dlink,dir-853-r1)
 	ucidef_set_led_netdev "internet" "internet" "blue:net" "wan"
 	;;
-dlink,dir-860l-b1)
-	ucidef_set_led_netdev "wan" "wan" "green:net" "wan"
-	;;
+dlink,dir-860l-b1|\
 dlink,dir-867-a1|\
 dlink,dir-878-a1|\
 dlink,dir-882-a1|\
 dlink,dir-882-r1|\
 motorola,mr2600)
 	ucidef_set_led_netdev "wan" "wan" "green:net" "wan"
-	ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "green:wlan2g" "ra0"
-	ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "green:wlan5g" "rai0"
 	;;
 gehua,ghl-r-001|\
 jcg,y2)
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index fb0b48f8c8..f8e02f2f50 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -46,13 +46,6 @@ ramips_setup_interfaces()
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
 		ucidef_set_interface_lan "eth0.1 ra0 rai0"
 		;;
-	dlink,dir-867-a1|\
-	dlink,dir-878-a1|\
-	dlink,dir-882-a1|\
-	dlink,dir-882-r1|\
-	motorola,mr2600)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 ra0 rai0" "wan"
-		;;
 	gehua,ghl-r-001)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "4:wan" "6@eth0"