From dfcc0172e09822e1bbd54593ab3eb30e006365d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85strand?= Date: Fri, 29 Jan 2021 10:27:40 +0100 Subject: Adapt build to using cmsis_system The core_software handling has split cmsis_startup into cmsis_system and cmsis_startup in order to be able to controll the build of the libraries per excecutable. This change adapts to that change. Change-Id: I13286c75ba1c2298e760f9c0594ce4fec9db33dc --- targets/common/CMakeLists.txt | 4 +--- targets/corstone-300/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/targets/common/CMakeLists.txt b/targets/common/CMakeLists.txt index fa9b953..f3382f3 100644 --- a/targets/common/CMakeLists.txt +++ b/targets/common/CMakeLists.txt @@ -52,9 +52,7 @@ target_link_libraries(ethosu_target_link INTERFACE ethosu_target_common) # Startup add_library(ethosu_target_startup INTERFACE) target_link_libraries(ethosu_target_startup INTERFACE ethosu_target_link) - -target_link_libraries(ethosu_target_startup INTERFACE $) -add_dependencies(ethosu_target_startup $) +target_link_libraries(ethosu_target_startup INTERFACE cmsis_system) # Init add_library(ethosu_target_init INTERFACE) diff --git a/targets/corstone-300/CMakeLists.txt b/targets/corstone-300/CMakeLists.txt index d162537..03226c7 100644 --- a/targets/corstone-300/CMakeLists.txt +++ b/targets/corstone-300/CMakeLists.txt @@ -50,6 +50,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers.cmake) # Corstone-300 ############################################################################# +# Enable trustzone support in core_software +set(TRUSTZONE_BUILD ON) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../common target) # Linker script -- cgit v1.2.1