gpu: nvgpu: include nvgpu common build configs in host Makefile

nvgpu userspace and test builds are prepared for both host/x86 and
target/aarch64. nvgpu common cflags file was included in the
Makefile of target builds. Include it in the host build
Makefile as well.
This makes sure we run the same config of qnx and nvgpu userspace
and test builds for MISRA, Coverage.

nvgpu shared config file defines the make variables and cflags app-
licable to nvgpu common shared by qnx, nvgpu userspace, test builds.
Note that cflags are added to variable NVGPU_COMMON_CFLAGS that need
to be used by the parent Makefile to update corresponding cflags
variable.

JIRA NVGPU-3062

Change-Id: Ia7a879698220f3b73aae3f02416cab28432531e0
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2119319
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/gpu/nvgpu/Makefile.shared.configs

@@ -20,29 +20,34 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
+# This file defines the make variables and cflags applicable to nvgpu common
+# shared by qnx, nvgpu userspace, test builds. Note that cflags are added to
+# variable NVGPU_COMMON_CFLAGS that needs to be used by the parent Makefile
+# to update corresponding cflags variable.
+
 # Support iGPU Virt for safety build until rmserver dependency is resolved
 IGPU_VIRT_SUPPORT               := 1
-NV_COMPONENT_CFLAGS             += -DIGPU_VIRT_SUPPORT
+NVGPU_COMMON_CFLAGS             := -DIGPU_VIRT_SUPPORT
 
 # Enable debugger APIs for safety build until devctl whitelisting is done
 NVGPU_DEBUGGER                  := 1
-NV_COMPONENT_CFLAGS             += -DNVGPU_DEBUGGER
+NVGPU_COMMON_CFLAGS             += -DNVGPU_DEBUGGER
 
 # Enable USERD for safety build until we switch to user mode submits only
-NV_COMPONENT_CFLAGS             += -DNVGPU_USERD
+NVGPU_COMMON_CFLAGS             += -DNVGPU_USERD
 
 # Enable Channel WDT for safety build until we switch to user mode submits only
 NV_COMPONENT_CFLAGS		+= -DNVGPU_CHANNEL_WDT
 
 # Enable iGPU LS PMU for safety build until devctl whitelisting is done
 NVGPU_LS_PMU                    := 1
-NV_COMPONENT_CFLAGS             += -DNVGPU_LS_PMU
+NVGPU_COMMON_CFLAGS             += -DNVGPU_LS_PMU
 
-NV_COMPONENT_CFLAGS             += -DNVGPU_ENGINE
+NVGPU_COMMON_CFLAGS             += -DNVGPU_ENGINE
 
 # Enable dgpu support for safety build for now. To be removed.
 NVGPU_DGPU_SUPPORT              := 1
-NV_COMPONENT_CFLAGS             += -DNVGPU_DGPU_SUPPORT
+NVGPU_COMMON_CFLAGS             += -DNVGPU_DGPU_SUPPORT
 
 ifeq ($(NV_BUILD_CONFIGURATION_IS_SAFETY),0)
 endif

drivers/gpu/nvgpu/Makefile.tmk

@@ -60,6 +60,7 @@ NV_COMPONENT_CFLAGS            	+= \
 	-DCONFIG_TEGRA_NVLINK
 
 -include $(NV_COMPONENT_DIR)/Makefile.shared.configs
+NV_COMPONENT_CFLAGS             += $(NVGPU_COMMON_CFLAGS)
 
 NVGPU_FAULT_INJECTION_ENABLEMENT := 1
 NV_COMPONENT_CFLAGS              += -DNVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT

userspace/Makefile

@@ -56,10 +56,13 @@ NVGPU_POSIX=1
 # Enable fault injection for unit tests
 NVGPU_FAULT_INJECTION_ENABLEMENT=1
 
-# Linuxy configs. We want these so that we can mirror builds from the actual
+# Linux configs. We want these so that we can mirror builds from the actual
 # Linux kernel.
 include Makefile.configs
 
+include $(NVGPU_SRC)/Makefile.shared.configs
+CONFIGS+=$(NVGPU_COMMON_CFLAGS)
+
 # Compiler, c-flags, etc.
 
 # CC      = clang

userspace/Makefile.tmk

@@ -128,6 +128,7 @@ NV_COMPONENT_CFLAGS            	+= \
 	-DNVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
 
 -include ../drivers/gpu/nvgpu/Makefile.shared.configs
+NV_COMPONENT_CFLAGS             += $(NVGPU_COMMON_CFLAGS)
 
 NV_COMPONENT_SYSTEMIMAGE_DIR    := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit/
 systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR)

userspace/units/Makefile.units.common.tmk

@@ -71,6 +71,7 @@ NV_COMPONENT_CFLAGS            	+= \
 	-DCONFIG_TEGRA_NVLINK
 
 -include $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/Makefile.shared.configs
+NV_COMPONENT_CFLAGS             += $(NVGPU_COMMON_CFLAGS)
 
 NV_COMPONENT_NEEDED_INTERFACE_DIRS := \
                                 $(NV_SOURCE)/kernel/nvgpu/userspace