From ec451550f961ee940e2d9393bd6a52f4d2c25685 Mon Sep 17 00:00:00 2001 From: Kristofer Jonsson Date: Fri, 4 Jun 2021 18:02:59 +0200 Subject: Buildsystem restructuring - Allow linker file to be overriden - Disable Trustzone build for other targets than Corstone-300 - Make toolchain TARGET_CPU variable cached Change-Id: I98a15e1080e4bf49e029578888b1e4ce362bbab7 --- targets/corstone-300/CMakeLists.txt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'targets/corstone-300') diff --git a/targets/corstone-300/CMakeLists.txt b/targets/corstone-300/CMakeLists.txt index 85fe944..7ae4d04 100644 --- a/targets/corstone-300/CMakeLists.txt +++ b/targets/corstone-300/CMakeLists.txt @@ -20,15 +20,13 @@ # Default parameters ############################################################################# -set(TARGET_CPU "cortex-m55") +set(TARGET_CPU "cortex-m55" CACHE INTERNAL "") if (NOT CMAKE_TOOLCHAIN_FILE) set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/toolchain/armclang.cmake") endif() -set(ETHOSU_COMMAND_DEFAULT python3 ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/run_ctest.py -t corstone-300) - -option(CPU_CACHE_ENABLE "Enable CPU instruction- and data cache" OFF) +set(ETHOSU_COMMAND_DEFAULT python3 ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/run_ctest.py -t corstone-300 CACHE INTERNAL "Default test command") ############################################################################# # Project @@ -44,8 +42,6 @@ include(CTest) include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers.cmake) -set(SCRIPTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts) - ############################################################################# # Corstone-300 ############################################################################# @@ -58,6 +54,7 @@ set(TRUSTZONE_BUILD ON) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../common target) +set(ETHOSU_TARGET_NPU_CONFIG "ethos-u55-128" CACHE STRING "NPU configuration") set(ETHOSU_TARGET_NPU_COUNT 1 CACHE INTERNAL "Number of NPUs") set(ETHOSU_TARGET_NPU_TA_COUNT 2 CACHE INTERNAL "Number of timing adapters per NPU") @@ -65,14 +62,11 @@ target_compile_definitions(ethosu_target_common INTERFACE ETHOSU_NPU_TA_COUNT=${ETHOSU_TARGET_NPU_TA_COUNT} ETHOSU_NPU_COUNT=${ETHOSU_TARGET_NPU_COUNT}) -if (CPU_CACHE_ENABLE) - target_compile_definitions(ethosu_target_common INTERFACE - CPU_CACHE_ENABLE) -endif() - # Linker script +set(LINK_FILE platform CACHE STRING "Link file") + ethosu_target_link_options(ethosu_target_link INTERFACE - LINK_FILE platform + LINK_FILE ${LINK_FILE} ENTRY Reset_Handler) # Add drivers @@ -91,4 +85,3 @@ target_link_libraries(ethosu_target_startup INTERFACE ethosu_core_driver timing_ # Add all applications add_subdirectory(../../applications applications) - -- cgit v1.2.1