From 3556669d0c93da2333ac358bbe26200a17c578b9 Mon Sep 17 00:00:00 2001 From: Seeta Rama Raju Date: Tue, 20 Oct 2020 13:49:43 +0530 Subject: [PATCH] uerspace: remove firmware files from nvgpu repo - Reworked on unit test framework, firmware files in nvgpu repo no longer required. Unit Tests will access firmware files from another path. Bug 3093555 Change-Id: I03a1006ec2a09ffdd46b83e93f0191a449836021 Signed-off-by: Seeta Rama Raju Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2433707 (cherry picked from commit 702636e7099dcc81f8d83de1023024e0f78e368e) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2435420 Reviewed-by: automaticguardword Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- userspace/Makefile.tmk | 37 +------------------- userspace/firmware/gv11b/NETD_img.bin | Bin 78184 -> 0 bytes userspace/firmware/gv11b/acr_ucode.bin | Bin 20992 -> 0 bytes userspace/firmware/gv11b/acr_ucode_dbg.bin | Bin 20992 -> 0 bytes userspace/firmware/gv11b/acr_ucode_prod.bin | Bin 20992 -> 0 bytes userspace/firmware/gv11b/fecs.bin | Bin 528 -> 0 bytes userspace/firmware/gv11b/fecs_sig.bin | Bin 108 -> 0 bytes userspace/firmware/gv11b/gpccs.bin | Bin 528 -> 0 bytes userspace/firmware/gv11b/gpccs_sig.bin | Bin 108 -> 0 bytes userspace/firmware/gv11b/pmu_bl.bin | Bin 1280 -> 0 bytes userspace/install-unit.sh | 1 - 11 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 userspace/firmware/gv11b/NETD_img.bin delete mode 100644 userspace/firmware/gv11b/acr_ucode.bin delete mode 100644 userspace/firmware/gv11b/acr_ucode_dbg.bin delete mode 100644 userspace/firmware/gv11b/acr_ucode_prod.bin delete mode 100644 userspace/firmware/gv11b/fecs.bin delete mode 100644 userspace/firmware/gv11b/fecs_sig.bin delete mode 100644 userspace/firmware/gv11b/gpccs.bin delete mode 100644 userspace/firmware/gv11b/gpccs_sig.bin delete mode 100644 userspace/firmware/gv11b/pmu_bl.bin diff --git a/userspace/Makefile.tmk b/userspace/Makefile.tmk index 3fdff9f54..615677cd0 100644 --- a/userspace/Makefile.tmk +++ b/userspace/Makefile.tmk @@ -66,34 +66,15 @@ NV_UNIT_SH=unit.sh NV_SUBMIT_UNIT_SH=nvgpu_submit_unit.sh NV_TESTLIST_PY=testlist.py NV_REQ_TESTS_INI=required_tests.ini -NV_NETD_IMG=NETD_img.bin -NV_FECS_IMG=fecs.bin -NV_FECS_SIG_IMG=fecs_sig.bin -NV_GPCCS_IMG=gpccs.bin -NV_GPCCS_SIG_IMG=gpccs_sig.bin -NV_ACR_UCODE_PROD_IMG=acr_ucode_prod.bin -NV_ACR_UCODE_DBG_IMG=acr_ucode_dbg.bin -NV_PMU_BL_IMG=pmu_bl.bin NV_COMPONENT_SYSTEMIMAGE_DIR := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit -NV_UNIT_REQ_FIRMWARE_DIR := $(NV_COMPONENT_SYSTEMIMAGE_DIR)/firmware/gv11b systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) \ $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/$(NV_SUBMIT_UNIT_SH) \ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) \ - $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_INI) \ - $(NV_UNIT_REQ_FIRMWARE_DIR) $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_SIG_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_SIG_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_PROD_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_DBG_IMG) \ - $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_PMU_BL_IMG) + $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_INI) #make the output directory $(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR) $(MKDIR_P) $@ -$(NV_UNIT_REQ_FIRMWARE_DIR) : $(NV_COMPONENT_SYSTEMIMAGE_DIR) - $(MKDIR_P) $@ #copy the test script $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) : $(NV_COMPONENT_DIR)/$(NV_UNIT_SH) $(NV_COMPONENT_SYSTEMIMAGE_DIR) @@ -105,22 +86,6 @@ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) : $(NV_COMPONENT_DIR)/$(NV_TES $(CP) $< $@ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_INI) : $(NV_COMPONENT_DIR)/$(NV_REQ_TESTS_INI) $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_NETD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_FECS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_FECS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_GPCCS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_GPCCS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_PROD_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_ACR_UCODE_PROD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_DBG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_ACR_UCODE_DBG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ -$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_PMU_BL_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_PMU_BL_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR) - $(CP) $< $@ include $(NV_BUILD_NVTEST_EXECUTABLE) diff --git a/userspace/firmware/gv11b/NETD_img.bin b/userspace/firmware/gv11b/NETD_img.bin deleted file mode 100644 index f80194cab46f75d16e8b1dc5b69cc5dce529eeaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78184 zcmeIuF#!Mo0K%a4Pwiz3h(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd z0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA zz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEj zFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r z3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`K>)F?Rp~ diff --git a/userspace/firmware/gv11b/acr_ucode.bin b/userspace/firmware/gv11b/acr_ucode.bin deleted file mode 100644 index ffbdb1ce18afbbd8a426693c2a4b366adea0e087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20992 zcmeIuF#!Mo0K%a4Pi+c6h(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* K1`HT5@EjOY00031 diff --git a/userspace/firmware/gv11b/acr_ucode_dbg.bin b/userspace/firmware/gv11b/acr_ucode_dbg.bin deleted file mode 100644 index ffbdb1ce18afbbd8a426693c2a4b366adea0e087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20992 zcmeIuF#!Mo0K%a4Pi+c6h(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* K1`HT5@EjOY00031 diff --git a/userspace/firmware/gv11b/acr_ucode_prod.bin b/userspace/firmware/gv11b/acr_ucode_prod.bin deleted file mode 100644 index ffbdb1ce18afbbd8a426693c2a4b366adea0e087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20992 zcmeIuF#!Mo0K%a4Pi+c6h(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* K1`HT5@EjOY00031 diff --git a/userspace/firmware/gv11b/fecs.bin b/userspace/firmware/gv11b/fecs.bin deleted file mode 100644 index 2e3e996bb70b55be8594e2847f4344d46c7e22c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 PcmZQz7zLvtfCvEq0uTTJ diff --git a/userspace/firmware/gv11b/fecs_sig.bin b/userspace/firmware/gv11b/fecs_sig.bin deleted file mode 100644 index 5762fdd10b608de6dd3762b977ccff93eecd5cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 LcmZQzpdSDL0BisO diff --git a/userspace/firmware/gv11b/gpccs.bin b/userspace/firmware/gv11b/gpccs.bin deleted file mode 100644 index 2e3e996bb70b55be8594e2847f4344d46c7e22c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 PcmZQz7zLvtfCvEq0uTTJ diff --git a/userspace/firmware/gv11b/gpccs_sig.bin b/userspace/firmware/gv11b/gpccs_sig.bin deleted file mode 100644 index 5762fdd10b608de6dd3762b977ccff93eecd5cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 LcmZQzpdSDL0BisO diff --git a/userspace/firmware/gv11b/pmu_bl.bin b/userspace/firmware/gv11b/pmu_bl.bin deleted file mode 100644 index 269b1d24709d138dc74fe198559aad0459d9fce4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1280 VcmZQz7zLvtFd71*AuuvS000F500961 diff --git a/userspace/install-unit.sh b/userspace/install-unit.sh index c26384d20..dadd50900 100755 --- a/userspace/install-unit.sh +++ b/userspace/install-unit.sh @@ -120,7 +120,6 @@ jcp $nvgpu_bins/libs/igpu-l4t_64/libnvgpu-drv-igpu.so nvgpu_unit/libnvgpu-drv-ig jcp $TOP/kernel/nvgpu/userspace/unit.sh nvgpu_unit/unit.sh jcp $TOP/kernel/nvgpu/userspace/gcov.sh nvgpu_unit/gcov.sh jcp $TOP/kernel/nvgpu/userspace/testlist.py nvgpu_unit/testlist.py -jcp $TOP/kernel/nvgpu/userspace/firmware/gv11b nvgpu_unit/firmware/ find $nvgpu_bins/userspace/units -name "*.so" -not -path "*unit.so" \ -not -path "*drv.so" -exec du -b {} \; | sort -n | while read size unit_so ; do