natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IE][VPU]: Use unified pcie firmware (#3383) 

* Unified firmware named pcie-ma2x8x is needed to use both ma2480 and ma2085 with pcie connection.
* Update firmware built from R14 release branch
This commit is contained in:
Maksim Doronin 2020-11-27 15:25:37 +03:00 committed by GitHub
parent a09de25dd2
commit 8f507a07f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inference-engine/cmake/vpu_dependencies.cmake
View File

@ -13,13 +13,13 @@ endif()
include(dependency_solver)
set(VPU_SUPPORTED_FIRMWARES usb-ma2x8x pcie-ma248x)
set(VPU_SUPPORTED_FIRMWARES usb-ma2x8x pcie-ma2x8x)
#
# Default packages
#
set(FIRMWARE_PACKAGE_VERSION 1508)
set(FIRMWARE_PACKAGE_VERSION 1522)
set(VPU_CLC_MA2X8X_VERSION "movi-cltools-20.09.2")
#
@ -31,7 +31,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
set(firmware_name_full ${firmware_name}.mvcmd)
# Handle PCIe elf firmware for Windows
if (WIN32 AND "${firmware_name}" STREQUAL "pcie-ma248x")
if (WIN32 AND "${firmware_name}" STREQUAL "pcie-ma2x8x")
set(firmware_name_full ${firmware_name}.elf)
endif ()
@ -69,7 +69,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
set(firmware_out_file "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${firmware_name}.mvcmd")
# Handle PCIe elf firmware for Windows
if (WIN32 AND "${firmware_name}" STREQUAL "pcie-ma248x")
if (WIN32 AND "${firmware_name}" STREQUAL "pcie-ma2x8x")
set(firmware_out_file "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${firmware_name}.elf")
endif ()

2
inference-engine/thirdparty/movidius/mvnc/src/mvnc_api.c vendored
View File

@ -424,7 +424,7 @@ static ncStatus_t getDeviceFwProtocolPrefix(const deviceDesc_t deviceDesc,
static char* getDevicePlatform(deviceDesc_t deviceDesc, int useUniversalFirmware) {
if (deviceDesc.platform == X_LINK_MYRIAD_X) {
if (useUniversalFirmware && deviceDesc.protocol != X_LINK_PCIE) {
if (useUniversalFirmware) {
return "ma2x8x";
} else {
return "ma248x";

2
inference-engine/thirdparty/movidius/mvnc/tests/cases/mvnc_common_test_cases.cpp vendored
View File

@ -100,7 +100,7 @@ std::string MvncTestsCommon::getMyriadFirmwarePath(const deviceDesc_t& in_device
#else
const std::string extension = "mvcmd";
#endif
return firmwareDir + std::string("pcie-ma248x.") + extension;
return firmwareDir + std::string("pcie-ma2x8x.") + extension;
}
return getMyriadUSBFirmwarePath(in_deviceDesc.name);

2
inference-engine/thirdparty/movidius/tests/XLink/helpers/XLink_tests_helpers.cpp vendored
View File

@ -88,7 +88,7 @@ std::string XLinkTestsHelper::getMyriadFirmwarePath(const deviceDesc_t& in_devic
#else
const std::string extension = "mvcmd";
#endif
return FIRMWARE_SUBFOLDER + std::string("pcie-ma248x.") + extension;
return FIRMWARE_SUBFOLDER + std::string("pcie-ma2x8x.") + extension;
}
return getMyriadUSBFirmwarePath(in_deviceDesc.name);