From 11cf87fd65f98680f43740f68d331f78cedae03d Mon Sep 17 00:00:00 2001 From: Bibhay Ranjan Date: Mon, 14 Nov 2022 18:42:02 +0530 Subject: [PATCH] nvethernet: remove OSI controlled CFLAGS All the common cflags will be controlled by OSI Bug 3759976 Bug 4088361 Change-Id: I97945270c034e00f2ca160697824cdedb8402f54 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2808843 (cherry picked from commit dea31bfcefa03ab3989bd2a3b25aee804eab559c) Signed-off-by: Bibhay Ranjan Signed-off-by: Revanth Kumar Uppala Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2897234 Reviewed-by: Narayan Reddy Reviewed-by: Laxman Dewangan GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/Makefile b/drivers/net/ethernet/nvidia/nvethernet/Makefile index 59d23a3a..b8b60122 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/Makefile +++ b/drivers/net/ethernet/nvidia/nvethernet/Makefile @@ -7,12 +7,11 @@ OSI_DMA := nvethernetrm/osi/dma obj-m += nvethernet.o -ccflags-y += -DLINUX_IVC -DUPDATED_PAD_CAL -mno-outline-atomics \ +# These CFLAGS must not be shared/used in OSI. These are local to Linux +ccflags-y += -DLINUX_OS -DNET30 -DNVPKCS_MACSEC -DLINUX_IVC -DUPDATED_PAD_CAL -mno-outline-atomics \ -I$(srctree.nvidia-oot)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/include \ -I$(srctree.nvidia-oot)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/osi/common/include -ccflags-y += -DMACSEC_SUPPORT -DNET30 -DDEBUG_MACSEC -DOSI_DEBUG $(if $(CONFIG_TEGRA_EPL),-DHSI_SUPPORT,) -DLINUX_OS -DNVPKCS_MACSEC - nvethernet-objs:= ether_linux.o \ osd.o \ ethtool.o \ @@ -45,3 +44,8 @@ nvethernet-objs:= ether_linux.o \ $(OSI_CORE)/frp.o \ $(OSI_CORE)/vlan_filter.o \ $(OSI_CORE)/debug.o + +include $(srctree.nvidia-oot)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/include/config.tmk + +# Undefine HSI_SUPPORT if CONFIG_TEGRA_EPL is not defined. +ccflags-y += $(if $(CONFIG_TEGRA_EPL),,-UHSI_SUPPORT) \ No newline at end of file