diff options
| author | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-03-18 11:44:48 +0000 |
|---|---|---|
| committer | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-03-18 12:02:14 +0000 |
| commit | f98d0628d43b12feb7e05c97da2608d384cfd7ee (patch) | |
| tree | 898dd9a9528c08b16e8d1a7de79fe4a5788d91d9 /source | |
| parent | 17069628a7f28198652a296ac16dc83529c7eaae (diff) | |
| download | ml-embedded-evaluation-kit-f98d0628d43b12feb7e05c97da2608d384cfd7ee.tar.gz | |
MLECO-2999: Minor improvement for HAL NPU component
Dcoumentation updates in line with recent refactoring and some
minor update to the HAL's NPU component.
Change-Id: Iadb34dbcdedf7259f786c42bd8fcf2d950a51410
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
Diffstat (limited to 'source')
| -rw-r--r-- | source/hal/source/components/cmsis_device/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/hal/source/components/npu/CMakeLists.txt | 32 |
2 files changed, 24 insertions, 10 deletions
diff --git a/source/hal/source/components/cmsis_device/CMakeLists.txt b/source/hal/source/components/cmsis_device/CMakeLists.txt index dcaeff5..11b8658 100644 --- a/source/hal/source/components/cmsis_device/CMakeLists.txt +++ b/source/hal/source/components/cmsis_device/CMakeLists.txt @@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 3.15.6) set(CMSIS_DEVICE_TARGET cmsis_device) -set(CPU_HEADER_TARGET cmsis_device_cpu_header) +set(CPU_HEADER_TARGET rte_components) project(${CMSIS_DEVICE_TARGET} DESCRIPTION "Generic CMSIS start up file for Cortex-M targets" diff --git a/source/hal/source/components/npu/CMakeLists.txt b/source/hal/source/components/npu/CMakeLists.txt index 8ead146..729a297 100644 --- a/source/hal/source/components/npu/CMakeLists.txt +++ b/source/hal/source/components/npu/CMakeLists.txt @@ -20,8 +20,8 @@ ######################################################### cmake_minimum_required(VERSION 3.15.6) -set(ETHOS_U_NPU_INIT_COMPONENT ethos_u_npu) -project(${ETHOS_U_NPU_INIT_COMPONENT} +set(ETHOS_U_NPU_COMPONENT ethos_u_npu) +project(${ETHOS_U_NPU_COMPONENT} DESCRIPTION "Ethos-U NPU initialization library" LANGUAGES C CXX ASM) @@ -108,27 +108,41 @@ else() NPU_REGIONCFG_1=0) # AXI0=M0 for U55/U65 endif() # Create static library -add_library(${ETHOS_U_NPU_INIT_COMPONENT} STATIC) +add_library(${ETHOS_U_NPU_COMPONENT} STATIC) ## Include directories - public -target_include_directories(${ETHOS_U_NPU_INIT_COMPONENT} +target_include_directories(${ETHOS_U_NPU_COMPONENT} PUBLIC include ${SOURCE_GEN_DIR}) ## Component sources -target_sources(${ETHOS_U_NPU_INIT_COMPONENT} +target_sources(${ETHOS_U_NPU_COMPONENT} PRIVATE ethosu_npu_init.c ethosu_cpu_cache.c) ## Add dependencies: -target_link_libraries(${ETHOS_U_NPU_INIT_COMPONENT} PUBLIC - cmsis_device_cpu_header +target_link_libraries(${ETHOS_U_NPU_COMPONENT} PUBLIC ethosu_core_driver log) -target_compile_definitions(${ETHOS_U_NPU_INIT_COMPONENT} +## If the rte_components target has been defined, include it as a dependency here. This component +## gives access to certain CPU related functions and definitions that should come from the CMSIS +## or custom system setup and boot implementation files. +## If the component is not defined as a target, a dependency for this target should be added by +## the project importing this one. +if (TARGET rte_components) + target_link_libraries(${ETHOS_U_NPU_COMPONENT} PUBLIC + rte_components) +else() + message(WARNING + "rte_components target not defined." + "${ETHOS_U_NPU_COMPONENT} will need to be provided access to" + "RTE_Compnents.h header to include CPU specific definitions.") +endif() + +target_compile_definitions(${ETHOS_U_NPU_COMPONENT} PUBLIC ARM_NPU ${ETHOS_U_NPU_MEMORY_MODE_FLAG}) @@ -136,5 +150,5 @@ target_compile_definitions(${ETHOS_U_NPU_INIT_COMPONENT} # Display status message(STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR}) message(STATUS "*******************************************************") -message(STATUS "Library : " ${ETHOS_U_NPU_INIT_COMPONENT}) +message(STATUS "Library : " ${ETHOS_U_NPU_COMPONENT}) message(STATUS "*******************************************************") |