treewide: disable GL.iNet’s devices support

This is required by their group admin, since
they can represent the GL.iNet official.

package/boot/uboot-mediatek/Makefile

@@ -236,30 +236,6 @@ define U-Boot/mt7986_bananapi_bpi-r3-nor
   FIP_COMPRESS:=1
 endef
 
-define U-Boot/mt7986_glinet_gl-mt6000
-  NAME:=GL.iNet GL-MT6000
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=glinet_gl-mt6000
-  UBOOT_CONFIG:=mt7986a_glinet_gl-mt6000
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=emmc
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
-endef
-
-define U-Boot/mt7986_xiaomi_redmi-router-ax6000
-  NAME:=Xiaomi Redmi AX6000
-  BUILD_SUBTARGET:=filogic
-  BUILD_DEVICES:=xiaomi_redmi-router-ax6000-ubootmod
-  UBOOT_CONFIG:=mt7986_xiaomi_redmi-ax6000
-  UBOOT_IMAGE:=u-boot.fip
-  BL2_BOOTDEV:=spim-nand
-  BL2_SOC:=mt7986
-  BL2_DDRTYPE:=ddr4
-  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ddr4
-endef
-
 UBOOT_TARGETS := \
 	mt7620_mt7530_rfb \
 	mt7620_rfb \
@@ -280,8 +256,6 @@ UBOOT_TARGETS := \
 	mt7986_bananapi_bpi-r3-sdmmc \
 	mt7986_bananapi_bpi-r3-snand \
 	mt7986_bananapi_bpi-r3-nor \
-  mt7986_glinet_gl-mt6000 \
-	mt7986_xiaomi_redmi-router-ax6000 \
 	mt7986_rfb
 
 ifdef CONFIG_TARGET_mediatek

target/linux/ipq807x/image/generic.mk

@@ -32,44 +32,66 @@ define Device/qnap_301w
 endef
 TARGET_DEVICES += qnap_301w
 
-define Device/zte_mf269
+define Device/redmi_ax6
+	$(call Device/xiaomi_ax3600)
+	DEVICE_VENDOR := Redmi
+	DEVICE_MODEL := AX6
+	DEVICE_PACKAGES := ipq-wifi-redmi_ax6
+endef
+TARGET_DEVICES += redmi_ax6
+
+define Device/tplink_xtr10890
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
-	DEVICE_VENDOR := ZTE
-	DEVICE_MODEL := MF269
+	DEVICE_VENDOR := TPLINK
+	DEVICE_MODEL := XTR10890
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	DEVICE_DTS_CONFIG := [email protected]
+	SOC := ipq8078
+	DEVICE_PACKAGES := ipq-wifi-tplink_xtr10890 uboot-envtools
+endef
+TARGET_DEVICES += tplink_xtr10890
+
+define Device/xiaomi_ax3600
+	$(call Device/FitImage)
+	$(call Device/UbiFit)
+	DEVICE_VENDOR := Xiaomi
+	DEVICE_MODEL := AX3600
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	DEVICE_DTS_CONFIG := config@ac04
 	SOC := ipq8071
-	DEVICE_PACKAGES := ipq-wifi-zte_mf269 uboot-envtools
+	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax3600 kmod-ath10k-ct-smallbuffers ath10k-firmware-qca9887-ct
 endef
-TARGET_DEVICES += zte_mf269
+TARGET_DEVICES += xiaomi_ax3600
 
-define Device/tplink_tl-er2260t
+define Device/xiaomi_ax9000
 	$(call Device/FitImage)
-	$(call Device/UbiFit)  
-	DEVICE_DTS := ipq8070-tl-er2260t
-	DEVICE_DTS_CONFIG := config@hk07
+	$(call Device/UbiFit)
+	DEVICE_VENDOR := Xiaomi
+	DEVICE_MODEL := AX9000
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
-	BOARD_NAME := tplink,tl-er2260t
-	DEVICE_TITLE := TPLINK TL-ER2260T
-	DEVICE_PACKAGES := qca-ssdk-shell
+	DEVICE_DTS_CONFIG := config@hk14
+	SOC := ipq8072
+	DEVICE_PACKAGES := ipq-wifi-xiaomi_ax9000 kmod-ath11k-pci ath11k-firmware-qcn9074 \
+	kmod-ath10k-ct ath10k-firmware-qca9887-ct
 endef
-TARGET_DEVICES += tplink_tl-er2260t
+TARGET_DEVICES += xiaomi_ax9000
 
-define Device/tplink_xtr10890
+define Device/zte_mf269
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
-	DEVICE_VENDOR := TPLINK
-	DEVICE_MODEL := XTR10890
+	DEVICE_VENDOR := ZTE
+	DEVICE_MODEL := MF269
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
-	DEVICE_DTS_CONFIG := config@hk01.c6
-	SOC := ipq8078
-	DEVICE_PACKAGES := ipq-wifi-tplink_xtr10890 uboot-envtools
+	DEVICE_DTS_CONFIG := config@ac04
+	SOC := ipq8071
+	DEVICE_PACKAGES := ipq-wifi-zte_mf269 uboot-envtools
 endef
-TARGET_DEVICES += tplink_xtr10890
+TARGET_DEVICES += zte_mf269
 
 define Device/zyxel_nbg7815
 	$(call Device/FitImage)

target/linux/mediatek/image/filogic.mk

@@ -36,37 +36,6 @@ define Build/mt7986-gpt
 	rm $@.tmp
 endef
 
-metadata_gl_json = \
-	'{ $(if $(IMAGE_METADATA),$(IMAGE_METADATA)$(comma)) \
-		"metadata_version": "1.1", \
-		"compat_version": "$(call json_quote,$(compat_version))", \
-		$(if $(DEVICE_COMPAT_MESSAGE),"compat_message": "$(call json_quote,$(DEVICE_COMPAT_MESSAGE))"$(comma)) \
-		$(if $(filter-out 1.0,$(compat_version)),"new_supported_devices": \
-			[$(call metadata_devices,$(SUPPORTED_DEVICES))]$(comma) \
-			"supported_devices": ["$(call json_quote,$(legacy_supported_message))"]$(comma)) \
-		$(if $(filter 1.0,$(compat_version)),"supported_devices":[$(call metadata_devices,$(SUPPORTED_DEVICES))]$(comma)) \
-		"version": { \
-			"release": "$(call json_quote,$(VERSION_NUMBER))", \
-			"date": "$(shell TZ='Asia/Chongqing' date '+%Y%m%d%H%M%S')", \
-			"dist": "$(call json_quote,$(VERSION_DIST))", \
-			"version": "$(call json_quote,$(VERSION_NUMBER))", \
-			"revision": "$(call json_quote,$(REVISION))", \
-			"target": "$(call json_quote,$(TARGETID))", \
-			"board": "$(call json_quote,$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)))" \
-		} \
-	}'
-
-define Build/append-gl-metadata
-	$(if $(SUPPORTED_DEVICES),-echo $(call metadata_gl_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
-	sha256sum "$@" | cut -d" " -f1 > "$@.sha256sum"
-	[ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || { \
-		cp "$(BUILD_KEY).ucert" "$@.ucert" ;\
-		usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\
-		ucert -A -c "$@.ucert" -x "$@.sig" ;\
-		fwtool -S "$@.ucert" "$@" ;\
-	}
-endef
-
 define Build/cetron-header
 	$(eval magic=$(word 1,$(1)))
 	$(eval model=$(word 2,$(1)))
@@ -98,7 +67,6 @@ define Device/asus_tuf-ax4200
 endef
 TARGET_DEVICES += asus_tuf-ax4200
 
-
 define Device/bananapi_bpi-r3
   DEVICE_VENDOR := Bananapi
   DEVICE_MODEL := BPi-R3
@@ -146,7 +114,6 @@ define Device/bananapi_bpi-r3
 endef
 TARGET_DEVICES += bananapi_bpi-r3
 
-
 define Device/cetron_ct3003
   DEVICE_VENDOR := Cetron
   DEVICE_MODEL := CT3003
@@ -190,24 +157,21 @@ define Device/glinet_gl-mt3000
   KERNEL_IN_UBI := 1
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += glinet_gl-mt3000
+#TARGET_DEVICES += glinet_gl-mt3000
 
 define Device/glinet_gl-mt6000
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT6000
   DEVICE_DTS := mt7986a-glinet-gl-mt6000
   DEVICE_DTS_DIR := ../dts
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb3 kmod-mt7986-firmware mt7986-wo-firmware e2fsprogs f2fsck mkf2fs
+  DEVICE_PACKAGES := e2fsprogs f2fsck mkf2fs kmod-usb3 kmod-mt7986-firmware mt7986-wo-firmware
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-gl-metadata
-  ARTIFACTS := preloader.bin bl31-uboot.fip
-  ARTIFACT/preloader.bin := bl2 emmc-ddr4
-  ARTIFACT/bl31-uboot.fip := bl31-uboot glinet_gl-mt6000
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += glinet_gl-mt6000
+#TARGET_DEVICES += glinet_gl-mt6000
 
 define Device/h3c_magic-nx30-pro
   DEVICE_VENDOR := H3C

target/linux/ramips/image/mt7621.mk

@@ -731,9 +731,9 @@ define Device/glinet_gl-mt1300
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT1300
-  DEVICE_PACKAGES := kmod-mt7615d_dbdc kmod-usb3 -luci-newapi -wpad-openssl
+  DEVICE_PACKAGES := kmod-mt7615-firmware kmod-usb3 -uboot-envtools
 endef
-TARGET_DEVICES += glinet_gl-mt1300
+#TARGET_DEVICES += glinet_gl-mt1300
 
 define Device/gnubee_gb-pc1
   $(Device/dsa-migration)