Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 27 Jul 2026 13:04:10 +0000
From:      Bjoern A. Zeeb <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Cc:        Jim Chen <jim.chen.1827@gmail.com>
Subject:   git: b1f3726f7a67 - main - mt76: update script to to deal with 7921 and 7925 flavors
Message-ID:  <6a67574a.3aa02.284f7058@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=b1f3726f7a677ae230135d19491ce97f2866e7c2

commit b1f3726f7a677ae230135d19491ce97f2866e7c2
Author:     Jim Chen <jim.chen.1827@gmail.com>
AuthorDate: 2026-07-27 13:01:23 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-07-27 13:03:32 +0000

    mt76: update script to to deal with 7921 and 7925 flavors
    
    Update the mt76/zzz_fw_ports_fwget.sh script to set fwget to download
    mt7921 and mt7925 rather than the these days non-existent mt792x flavor.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      30 days
    Differential Revision: https://reviews.freebsd.org/D57242
---
 .../dev/mediatek/mt76/zzz_fw_ports_fwget.sh        | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh
index fa836b4b500d..8f7e53c54f64 100644
--- a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh
+++ b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh
@@ -24,6 +24,11 @@ DRIVER=mt76
 FWSUBDIR=mediatek
 CHECKFILE=mt792x.h
 
+SYS=../../../..
+LINUXKPI_INCLUDES="-I${SYS}/compat/linuxkpi/common/include \
+	-I${SYS}/compat/linuxkpi/dummy/include \
+	-include ${SYS}/compat/linuxkpi/common/include/linux/kconfig.h"
+
 ################################################################################
 #
 # Check pre-reqs
@@ -56,8 +61,8 @@ get_device_ids_by_flav()
 		case ${d} in
 		mt7615)	flav=${d} ;;
 		mt7915)	flav=${d} ;;
-		mt7921)	flav=mt792x ;;
-		mt7925)	flav=mt792x ;;
+		mt7921)	flav=${d} ;;
+		mt7925)	flav=${d} ;;
 		mt7996)	flav=${d} ;;
 		*)	printf "ERROR: unsupported directory/flavor '%s'\n" ${d} >&2
 			exit 1
@@ -80,19 +85,22 @@ get_device_ids_by_flav()
 
 get_firmwares_by_flavor()
 {
-	for h in mt7615/mt7615.h mt7915/mt7915.h mt792x.h mt7996/mt7996.h; do
+	for h in mt7615/mt7615.h mt7915/mt7915.h mt7921/mt7921.h mt7925/mt7925.h mt7996/mt7996.h; do
 
 		case ${h} in
 		mt7615/mt7615.h)	flav=mt7615 ;;
 		mt7915/mt7915.h)	flav=mt7915 ;;
-		mt792x.h)		flav=mt792x ;;
+		mt7921/mt7921.h)	flav=mt7921 ;;
+		mt7925/mt7925.h)	flav=mt7925 ;;
 		mt7996/mt7996.h)	flav=mt7996 ;;
 		*)	printf "ERROR: unsupported header/flavor '%s'\n" ${h} >&2
 			exit 1
 			;;
 		esac
 
-		awk -v rege="${FWSUBDIR}/" -v flav=${flav} -F\" '{ if ($0 ~ rege) { printf "%s\t%s\n", tolower(flav), $2; } }' ${h} | \
+		# Use preprocessor with a minimal include list to get #defines
+		cpp ${LINUXKPI_INCLUDES} -dM -M -MG -MF /dev/null ${h} 2> /dev/null | \
+		awk -v rege="${FWSUBDIR}/" -v flav=${flav} -F\" '{ if ($0 ~ rege) { printf "%s\t%s\n", tolower(flav), $2; } }' | \
 		while read flav fwn; do
 			if test ! -e ${LFWDIR}/${fwn}; then
 				#printf "Firmware %s (for %s) does not exist; skipping\n" ${fwn} ${flav} >&2
@@ -253,12 +261,12 @@ if test ${fn} -gt 0; then
 		# printf "===> did %s flav %s\n" ${did} ${flav} >&2
 
 		if test ${n} -eq 1; then
-			echo "${did} ${flav}" | awk -v drv=${FWSUBDIR} '{
+			echo "${did} ${flav}" | awk -v drv=${DRIVER} '{
 				printf "\t%s)\taddpkg \"wifi-firmware-%s-kmod-%s\"; return 1 ;;\n",
 				    tolower($1), drv, tolower($2);
 			}' >> ${fwgetfile}
 		else
-			echo "${did} ${flav}" | awk -v drv=${FWSUBDIR} '{
+			echo "${did} ${flav}" | awk -v drv=${DRIVER} '{
 				printf "\t%s)\taddpkg \"wifi-firmware-%s-kmod-%s\"\n",
 				    tolower($1), drv, tolower($2);
 			}' >> ${fwgetfile}
@@ -276,7 +284,7 @@ if test ${fn} -gt 0; then
 
 				#printf "===> did %s flav %s\n" ${did} ${flav} >&2
 
-				echo "${did} ${flav}" | awk -v drv=${FWSUBDIR} '{
+				echo "${did} ${flav}" | awk -v drv=${DRIVER} '{
 					printf "\t\taddpkg \"wifi-firmware-%s-kmod-%s\"\n",
 					    drv, tolower($2);
 				}' >> ${fwgetfile}
@@ -290,5 +298,6 @@ if test ${fn} -gt 0; then
 fi
 
 printf "INFO: fwget pci_network_mediatek %s template at %s\n" ${DRIVER} ${fwgetfile} >&2
+printf "WARNING: make sure to check for PCI_VENDOR_ID_* other than Mediatek"
 
 # end
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a67574a.3aa02.284f7058>