From 1cbe70a9c64d0d3f2c4a58473da9401b4684135f Mon Sep 17 00:00:00 2001 From: vinodg Date: Thu, 23 Jan 2020 12:52:33 -0800 Subject: [PATCH] gpu: nvgpu: Fix unit test build break. Remove nvgpu-gr library usage from Makefile. mock-iospace is enough to support for the needed iospace. Jira NVGPU-2192 Change-Id: I21a5158c69ca23039dac5e509a9a0c711848e178 Signed-off-by: vinodg Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2284451 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seshendra Gadagottu Reviewed-by: Nicolas Benech Reviewed-by: Alex Waterman Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: Nicolas Benech Tested-by: mobile promotions --- userspace/units/pmu/Makefile | 5 ----- userspace/units/pmu/Makefile.tmk | 1 - 2 files changed, 6 deletions(-) diff --git a/userspace/units/pmu/Makefile b/userspace/units/pmu/Makefile index 555dc11d7..916cd8347 100644 --- a/userspace/units/pmu/Makefile +++ b/userspace/units/pmu/Makefile @@ -24,20 +24,15 @@ OBJS = nvgpu-pmu.o MODULE = nvgpu-pmu LIB_PATHS += -lfalcon_utf \ - -lnvgpu-gr \ -lmock-iospace include ../Makefile.units lib$(MODULE).so: falcon_utf \ - nvgpu-gr \ mock-iospace falcon_utf: $(MAKE) -C ../falcon -nvgpu-gr: - $(MAKE) -C ../gr - mock-iospace: $(MAKE) -C ../mock-iospace diff --git a/userspace/units/pmu/Makefile.tmk b/userspace/units/pmu/Makefile.tmk index 557361c93..ed32ea59d 100644 --- a/userspace/units/pmu/Makefile.tmk +++ b/userspace/units/pmu/Makefile.tmk @@ -29,7 +29,6 @@ NVGPU_UNIT_SRCS=nvgpu-pmu.c NVGPU_UNIT_INTERFACE_DIRS := \ $(NV_COMPONENT_DIR)/../falcon \ - $(NV_COMPONENT_DIR)/../gr \ $(NV_COMPONENT_DIR)/../mock-iospace \ $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu