From: Mario Andrés Pérez Date: Tue, 3 Jun 2025 22:21:34 +0000 (+0200) Subject: ramips: mt7621: include uboot-envtools in some missed devices X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19012%2Fhead;p=thirdparty%2Fopenwrt.git ramips: mt7621: include uboot-envtools in some missed devices Add uboot-envtools (removing -uboot-envtools) to devices which were missed in the commit 79bd017 ("ramips: mt7621: add uboot-envtools to all devices") - Mi Router 3G - Mi Router AC2100 While at here remove two redundant entries from devices which were added just after the referenced commit 79bd017 and did not account for the new DEFAULT_PACKAGES member: - SNR-CPE-ME1 - SNR-CPE-ME2-SFP Fixes: 79bd017 ("ramips: mt7621: add uboot-envtools to all devices") Fixes: https://github.com/openwrt/openwrt/issues/18960 Signed-off-by: Mario Andrés Pérez Link: https://github.com/openwrt/openwrt/pull/19012 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 28b5c3f31ac..9398584cdb4 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -2606,14 +2606,14 @@ endef TARGET_DEVICES += sim_simax1800t define Device/snr_snr-cpe-me1 - $(Device/dsa-migration) - $(Device/uimage-lzma-loader) - IMAGE_SIZE := 15040k - DEVICE_VENDOR := SNR - DEVICE_MODEL := SNR-CPE-ME1 - UIMAGE_NAME := SNR-CPE-ME1-5GHZ-MT - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x0e kmod-usb3 \ - kmod-usb-ledtrig-usbport uboot-envtools + $(Device/dsa-migration) + $(Device/uimage-lzma-loader) + IMAGE_SIZE := 15040k + DEVICE_VENDOR := SNR + DEVICE_MODEL := SNR-CPE-ME1 + UIMAGE_NAME := SNR-CPE-ME1-5GHZ-MT + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x0e kmod-usb3 \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += snr_snr-cpe-me1 @@ -2636,8 +2636,8 @@ define Device/snr_snr-cpe-me2-sfp DEVICE_VENDOR := SNR DEVICE_MODEL := SNR-CPE-ME2-SFP UIMAGE_NAME := $$(DEVICE_MODEL) - DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 \ - kmod-sfp kmod-usb-ledtrig-usbport uboot-envtools + DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 kmod-sfp \ + kmod-usb-ledtrig-usbport endef TARGET_DEVICES += snr_snr-cpe-me2-sfp @@ -3219,8 +3219,7 @@ define Device/xiaomi_mi-router-3g $(Device/xiaomi_nand_separate) DEVICE_MODEL := Mi Router 3G IMAGE_SIZE := 124416k - DEVICE_PACKAGES += kmod-mt7603 kmod-mt76x2 kmod-usb3 \ - kmod-usb-ledtrig-usbport -uboot-envtools + DEVICE_PACKAGES += kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += R3G mir3g xiaomi,mir3g endef TARGET_DEVICES += xiaomi_mi-router-3g @@ -3286,7 +3285,7 @@ define Device/xiaomi_mi-router-ac2100 $(Device/xiaomi_nand_separate) DEVICE_MODEL := Mi Router AC2100 IMAGE_SIZE := 120320k - DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615-firmware -uboot-envtools + DEVICE_PACKAGES += kmod-mt7603 kmod-mt7615-firmware endef TARGET_DEVICES += xiaomi_mi-router-ac2100