From 927a33af1caac3deb42b7406dcd31eee5296b761 Mon Sep 17 00:00:00 2001 From: Besar Wicaksono Date: Tue, 13 May 2025 22:02:42 +0000 Subject: [PATCH] tegra: hwpm: fix userspace tmake files Fixing the paths used in the tmake files to build userspace library and test. JIRA MSST-830 Change-Id: Ib4469794d66aa20ae343b367acdc4f43b5e3c4ab Signed-off-by: Besar Wicaksono Reviewed-on: https://git-master.nvidia.com/r/c/linux-hwpm/+/3363640 GVS: buildbot_gerritrpt Reviewed-by: svcacv Reviewed-by: Yifei Wan Reviewed-by: Vasuki Shankar --- libnvsochwpm/Makefile.umbrella.tmk | 3 ++- libnvsochwpm/os/lnx/libnvsochwpm.export | 12 +++++------- libnvsochwpm/tmake/test/Makefile.tmk | 23 ++++++++++++++++------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/libnvsochwpm/Makefile.umbrella.tmk b/libnvsochwpm/Makefile.umbrella.tmk index 2686f41..69d83c2 100644 --- a/libnvsochwpm/Makefile.umbrella.tmk +++ b/libnvsochwpm/Makefile.umbrella.tmk @@ -26,7 +26,8 @@ # Components in this repository # NV_REPOSITORY_COMPONENTS := \ - tmake/lib + tmake/lib \ + tmake/test # Local Variables: # indent-tabs-mode: t # tab-width: 8 diff --git a/libnvsochwpm/os/lnx/libnvsochwpm.export b/libnvsochwpm/os/lnx/libnvsochwpm.export index b7ae298..ca8ce74 100644 --- a/libnvsochwpm/os/lnx/libnvsochwpm.export +++ b/libnvsochwpm/os/lnx/libnvsochwpm.export @@ -12,18 +12,16 @@ nv_soc_hwpm_init nv_soc_hwpm_exit +nv_soc_hwpm_system_get_info nv_soc_hwpm_get_devices -nv_soc_hwpm_get_device_info -nv_soc_hwpm_get_ip_info -nv_soc_hwpm_get_ip_info_list -nv_soc_hwpm_get_resource_info -nv_soc_hwpm_get_resource_info_list +nv_soc_hwpm_device_get_info +nv_soc_hwpm_ip_get_info +nv_soc_hwpm_resource_get_info nv_soc_hwpm_session_alloc nv_soc_hwpm_session_free nv_soc_hwpm_session_get_info -nv_soc_hwpm_session_set_resources -nv_soc_hwpm_session_set_all_resources nv_soc_hwpm_session_reserve_resources +nv_soc_hwpm_session_reserve_all_resources nv_soc_hwpm_session_alloc_pma nv_soc_hwpm_session_set_get_pma_state nv_soc_hwpm_session_get_hs_credits diff --git a/libnvsochwpm/tmake/test/Makefile.tmk b/libnvsochwpm/tmake/test/Makefile.tmk index f2fdfcd..94d89ad 100644 --- a/libnvsochwpm/tmake/test/Makefile.tmk +++ b/libnvsochwpm/tmake/test/Makefile.tmk @@ -18,24 +18,33 @@ # ############################################################################### -ifdef NV_COMPONENT_FLAG_NVTEST_EXECUTABLE_SECTION +ifdef NV_COMPONENT_FLAG_DYNAMIC_EXECUTABLE_SECTION include $(NV_BUILD_START_COMPONENT) NV_COMPONENT_NAME := nv_soc_hwpm_test -NV_COMPONENT_SOURCES := \ - nv_soc_hwpm_test.cpp \ - t241_test.cpp +_soc_hwpm_dir = ../.. +_test_hwpm_dir = $(_soc_hwpm_dir)/test -_soc_hwpm_dir = ../../ +NV_COMPONENT_SOURCES := \ + $(NV_SOURCE)/3rdparty/google/googletest/googletest/src/gtest_main.cc \ + $(_test_hwpm_dir)/nv_soc_hwpm_test.cpp \ + $(_test_hwpm_dir)/t241_test.cpp \ + $(_test_hwpm_dir)/t410_test.cpp \ + $(_test_hwpm_dir)/soc_mode_e_buffer.cpp NV_COMPONENT_CFLAGS := -DNV_IS_LDK=1 -Wall NV_COMPONENT_INCLUDES := \ $(_common_includes) \ $(NV_SOURCE)/3rdparty/google/googletest/googletest/include \ + $(NV_SOURCE)/3rdparty/google/googletest/googletest \ $(NV_SOURCE)/3rdparty/google/googletest/googlemock/include \ - $$(_soc_hwpm_dir)/include + $(NV_SOURCE)/hwinc-private/th500/66838280 \ + $(NV_SOURCE)/hwinc-private/tb500/84849639 \ + $(_soc_hwpm_dir) \ + $(_soc_hwpm_dir)/include \ + $(_test_hwpm_dir) NV_COMPONENT_NEEDED_STATIC_INTERFACE_DIRS := \ $(NV_SOURCE)/3rdparty/google/googletest/googletest \ @@ -52,5 +61,5 @@ NV_COMPONENT_SYSTEM_SHARED_LIBRARIES := \ NV_COMPONENT_CODE_GENERATION := c++11 -include $(NV_BUILD_NVTEST_EXECUTABLE) +include $(NV_BUILD_DYNAMIC_EXECUTABLE) endif \ No newline at end of file