git: 2e7991d03888 - stable/14 - Fix bnxt build in LINT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Jun 2024 19:25:11 UTC
The branch stable/14 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=2e7991d038888bda9d8959d14f5963db29c41654
commit 2e7991d038888bda9d8959d14f5963db29c41654
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-05-29 15:45:47 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-06-03 19:23:15 +0000
Fix bnxt build in LINT
LINT includes bnxt_re driver. Adjust the path in files, add missing
files and add a new BNXT_C to build (which thinly wraps OFED version
with bnxt specicif stuff).
Sponsored by: Netflix
Fixes: acd884dec99a ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
(cherry picked from commit 175b2c00a6bcb0c8c1f6b76b6da9bf4879a5848e)
---
sys/conf/files | 13 ++++++++-----
sys/conf/kern.pre.mk | 4 ++++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/sys/conf/files b/sys/conf/files
index 7d3c44893e09..bf4d7d9cabfc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1322,11 +1322,14 @@ dev/bhnd/siba/siba_bhndb.c optional siba bhnd bhndb
dev/bhnd/siba/siba_erom.c optional siba bhnd
dev/bhnd/siba/siba_subr.c optional siba bhnd
#
-dev/bnxt/bnxt_hwrm.c optional bnxt iflib pci
-dev/bnxt/bnxt_mgmt.c optional bnxt iflib pci
-dev/bnxt/bnxt_sysctl.c optional bnxt iflib pci
-dev/bnxt/bnxt_txrx.c optional bnxt iflib pci
-dev/bnxt/if_bnxt.c optional bnxt iflib pci
+dev/bnxt/bnxt_en/bnxt_auxbus_compat.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/bnxt_dcb.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/bnxt_hwrm.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/bnxt_mgmt.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/bnxt_sysctl.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/bnxt_txrx.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/bnxt_ulp.c optional bnxt iflib pci compile-with "${BNXT_C}"
+dev/bnxt/bnxt_en/if_bnxt.c optional bnxt iflib pci compile-with "${BNXT_C}"
dev/bwi/bwimac.c optional bwi
dev/bwi/bwiphy.c optional bwi
dev/bwi/bwirf.c optional bwi
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 567c68e5887e..53b9862f2145 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -335,6 +335,10 @@ MLXFW_C= ${OFED_C_NOIMP} \
-I${SRCTOP}/sys/contrib/xz-embedded/freebsd \
-I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \
${.IMPSRC}
+# BNXT Driver
+BNXT_CFLAGS= -I$S/dev/bnxt/bnxt_en ${OFEDCFLAGS}
+BNXT_C_NOIMP= ${CC} -c -o ${.TARGET} ${BNXT_CFLAGS} ${WERROR}
+BNXT_C= ${BNXT_C_NOIMP} ${.IMPSRC}
GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/}
SYSTEM_CFILES= config.c env.c hints.c vnode_if.c