mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-18 02:19:39 +00:00
LinuxKPI: define LINUXKPI_INCLUDES for module builds as well
While for in-kernel we already have LINUXKPI_INCLUDES in kern.pre.mk for kmod builds we've not had a common define to use leading to various spellings of include paths. In order for the include list to be expanded more easily in the future, e.g., adding the "dummy" includes (for all) and to harmonize code, duplicate LINUXKPI_INCLUDES to kmod.mk and use it for all module Makefiles. MFC after: 1 week Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36683
This commit is contained in:
parent
bd93b5f79a
commit
514fb38721
@ -108,6 +108,9 @@ LINUXKPI_GENSRCS+= \
|
||||
opt_usb.h \
|
||||
opt_stack.h
|
||||
|
||||
LINUXKPI_INCLUDES+= \
|
||||
-I${SYSDIR}/compat/linuxkpi/common/include
|
||||
|
||||
CFLAGS+= ${WERROR}
|
||||
CFLAGS+= -D_KERNEL
|
||||
CFLAGS+= -DKLD_MODULE
|
||||
|
@ -7,6 +7,6 @@ SRCS = device_if.h bus_if.h miibus_if.h ofw_bus_if.h ifdi_if.h vnode_if.h
|
||||
SRCS += opt_inet.h opt_inet6.h opt_rss.h opt_iflib.h opt_platform.h
|
||||
SRCS += if_axgbe.c xgbe-sysctl.c xgbe_osdep.c xgbe-desc.c xgbe-drv.c xgbe-mdio.c xgbe-dev.c xgbe-i2c.c xgbe-phy-v1.c xgbe-txrx.c
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -7,6 +7,6 @@ SRCS = device_if.h bus_if.h miibus_if.h pci_if.h ifdi_if.h vnode_if.h
|
||||
SRCS += opt_inet.h opt_inet6.h opt_rss.h opt_iflib.h opt_platform.h
|
||||
SRCS += if_axgbe_pci.c xgbe-sysctl.c xgbe_osdep.c xgbe-desc.c xgbe-drv.c xgbe-mdio.c xgbe-dev.c xgbe-i2c.c xgbe-phy-v2.c xgbe-txrx.c
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -18,7 +18,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_kern_tls.h opt_ktr.h opt_ofed.h
|
||||
|
||||
CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
CFLAGS+= -DINET6 -DINET
|
||||
|
||||
|
@ -49,7 +49,7 @@ SRCS+= opt_inet.h opt_inet6.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DINET6 -DINET -DCONFIG_INFINIBAND_USER_MEM
|
||||
|
||||
EXPORT_SYMS= YES
|
||||
|
@ -10,7 +10,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_ofed.h
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
|
@ -14,7 +14,7 @@ SRCS+= irdma_ctrl.c irdma_hmc.c icrdma_hw.c irdma_pble.c irdma_puda.c irdma_uda.
|
||||
|
||||
CFLAGS+= -I${ICE_DIR} -I${OFED_INC_DIR}
|
||||
CFLAGS+= -I${OFED_INC_DIR}/uapi
|
||||
CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
|
||||
ice_rdma.h:
|
||||
|
@ -18,7 +18,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_cam.h icl_conn_if.h
|
||||
CFLAGS+= -I${SYSDIR}/
|
||||
CFLAGS+= -I${SYSDIR}/ofed/include
|
||||
CFLAGS+= -I${SYSDIR}/ofed/include/uapi
|
||||
CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
CFLAGS+= -DINET6 -DINET
|
||||
CFLAGS+= -fms-extensions
|
||||
|
@ -35,7 +35,7 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h
|
||||
CFLAGS+= -DKBUILD_MODNAME='"iwlwifi"'
|
||||
|
||||
CFLAGS+= -I${DEVIWLWIFIDIR}
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_IWLDVM=0
|
||||
CFLAGS+= -DCONFIG_IWLMVM=1
|
||||
# Helpful after fresh imports.
|
||||
|
@ -6,6 +6,6 @@ KMOD= lindebugfs
|
||||
SRCS= lindebugfs.c
|
||||
SRCS+= ${LINUXKPI_GENSRCS}
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -46,7 +46,7 @@ SRCS+= opt_apic.h
|
||||
SRCS+= opt_ddb.h
|
||||
SRCS+= ${LINUXKPI_GENSRCS}
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
|
||||
|
||||
EXPORT_SYMS= YES
|
||||
|
@ -8,7 +8,7 @@ SRCS= linux_80211.c \
|
||||
SRCS+= opt_wlan.h
|
||||
SRCS+= ${LINUXKPI_GENSRCS}
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
EXPORT_SYMS= YES
|
||||
|
||||
|
@ -28,7 +28,7 @@ SRCS+= opt_inet.h opt_inet6.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
EXPORT_SYMS= YES
|
||||
|
||||
|
@ -14,6 +14,6 @@ SRCS+= ${LINUXKPI_GENSRCS}
|
||||
SRCS+= opt_inet.h opt_inet6.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -21,7 +21,7 @@ SRCS+= opt_inet.h opt_inet6.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
CFLAGS+= -DINET6 -DINET
|
||||
|
||||
|
@ -40,7 +40,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.if defined(CONFIG_BUILD_FPGA)
|
||||
SRCS+= \
|
||||
|
@ -32,7 +32,7 @@ CFLAGS+= -DCONFIG_MLX5_FPGA
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
|
@ -11,7 +11,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_rss.h opt_ratelimit.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
|
@ -21,7 +21,7 @@ SRCS+= opt_inet.h opt_inet6.h opt_ratelimit.h opt_rss.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
|
||||
.if defined(CONFIG_BUILD_FPGA)
|
||||
|
@ -11,7 +11,7 @@ SRCS+= ${LINUXKPI_GENSRCS}
|
||||
CFLAGS+= \
|
||||
-I${SRCTOP}/sys/ofed/include \
|
||||
-I${SRCTOP}/sys/ofed/include/uapi \
|
||||
-I${SRCTOP}/sys/compat/linuxkpi/common/include \
|
||||
${LINUXKPI_INCLUDES} \
|
||||
-I${SRCTOP}/sys/contrib/xz-embedded/freebsd \
|
||||
-I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz
|
||||
|
||||
|
@ -26,7 +26,7 @@ SRCS+= opt_inet.h opt_inet6.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
CFLAGS+= -DINET6 -DINET
|
||||
|
||||
|
@ -7,7 +7,7 @@ KMOD= qat
|
||||
SRCS+= qat_ocf.c qat_ocf_mem_pool.c qat_ocf_utils.c
|
||||
SRCS+= device_if.h bus_if.h vnode_if.h pci_if.h cryptodev_if.h
|
||||
|
||||
CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/include
|
||||
|
@ -69,7 +69,7 @@ CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/common/compression/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/common/crypto/sym/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/firmware/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
|
||||
CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
|
@ -24,6 +24,6 @@ SRCS+= bus_if.h device_if.h pci_if.h vnode_if.h
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
|
||||
CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -13,7 +13,7 @@ SRCS+= qat_c4xxx/adf_c4xxx_pke_replay_stats.c qat_c4xxx/adf_c4xxx_ras.c qat_c4xx
|
||||
SRCS+= qat_c4xxx/adf_c4xxx_reset.c
|
||||
SRCS+= device_if.h bus_if.h vnode_if.h pci_if.h cryptodev_if.h
|
||||
|
||||
CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/include/common
|
||||
CFLAGS+= -I${SRCTOP}/sys/dev/qat/qat_api/include
|
||||
|
@ -69,7 +69,7 @@ CFLAGS += -DECORE_PACKAGE
|
||||
CFLAGS += -DCONFIG_ECORE_L2
|
||||
CFLAGS += -DECORE_CONFIG_DIRECT_HWFN
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
#CFLAGS += -g
|
||||
#CFLAGS += -fno-inline
|
||||
|
@ -60,7 +60,7 @@ CFLAGS += -DECORE_PACKAGE
|
||||
CFLAGS += -DCONFIG_ECORE_L2
|
||||
CFLAGS += -DECORE_CONFIG_DIRECT_HWFN
|
||||
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
CFLAGS += -g
|
||||
CFLAGS += -fno-inline
|
||||
|
@ -54,7 +54,7 @@ CFLAGS+= -I${.CURDIR}
|
||||
CFLAGS+= -I${ETHDRVR}
|
||||
CFLAGS+= -I${OFEDDIR}/ofed/include
|
||||
CFLAGS+= -I${OFEDDIR}/ofed/include/uapi
|
||||
CFLAGS+= -I${OFEDDIR}/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
CFLAGS+= -DLINUX_TYPES_DEFINED
|
||||
CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
|
||||
|
@ -7,6 +7,6 @@ SRCS+= ${LINUXKPI_GENSRCS}
|
||||
SRCS+= opt_inet.h opt_inet6.h
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include
|
||||
CFLAGS+= -I${SRCTOP}/sys/ofed/include/uapi
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -36,7 +36,7 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h
|
||||
CFLAGS+= -DKBUILD_MODNAME='"rtw88"'
|
||||
|
||||
CFLAGS+= -I${DEVRTW88DIR}
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_RTW88_DEBUG
|
||||
#CFLAGS+= -DCONFIG_RTW88_DEBUGFS
|
||||
|
||||
|
@ -31,7 +31,7 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h
|
||||
CFLAGS+= -DKBUILD_MODNAME='"rtw89"'
|
||||
|
||||
CFLAGS+= -I${DEVRTW89DIR}
|
||||
CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
|
||||
CFLAGS+= ${LINUXKPI_INCLUDES}
|
||||
CFLAGS+= -DCONFIG_RTW89_DEBUGMSG
|
||||
#CFLAGS+= -DCONFIG_RTW89_DEBUGFS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user