diff options
| author | Kristofer Jonsson <kristofer.jonsson@arm.com> | 2022-11-23 13:05:47 +0100 |
|---|---|---|
| committer | Kristofer Jonsson <kristofer.jonsson@arm.com> | 2022-12-15 09:00:11 +0100 |
| commit | 8f813b382c1ad54b9c9f5d34bab1e8892383c530 (patch) | |
| tree | 47b0e5433523e4e4e316da41a80827b1196c9b67 | |
| parent | 928058117714d6d740300b89fdd070cacfe44481 (diff) | |
| download | ethos-u-core-platform-8f813b382c1ad54b9c9f5d34bab1e8892383c530.tar.gz | |
Remove ethosu_core and ethosu_applications
Interface libraries ethosu_core and ethosu_applications are removed.
Each application shall depend directly on the libraries they need.
Change-Id: I1721ea0fd3c79e74da5e131a60f7aa24277c99ba
| -rw-r--r-- | applications/baremetal/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | applications/freertos/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | applications/message_handler/lib/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | applications/threadx_demo/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | applications/trustzone_inference/secure/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/helpers.cmake | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/applications/baremetal/CMakeLists.txt b/applications/baremetal/CMakeLists.txt index 37073bb..8e2fa32 100644 --- a/applications/baremetal/CMakeLists.txt +++ b/applications/baremetal/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Arm Limited. All rights reserved. +# SPDX-FileCopyrightText: Copyright 2021-2022 Arm Limited and/or its affiliates <open-source-office@arm.com> # # SPDX-License-Identifier: Apache-2.0 # @@ -21,7 +21,7 @@ set(BAREMETAL_PATH "" CACHE PATH "Path to input, output and network for baremeta if (IS_DIRECTORY ${BAREMETAL_PATH}) ethosu_add_executable_test(baremetal_custom PRIVATE SOURCES main.cpp - LIBRARIES $<$<TARGET_EXISTS:ethosu_monitor>:ethosu_monitor>) + LIBRARIES inference_process $<$<TARGET_EXISTS:ethosu_monitor>:ethosu_monitor>) target_include_directories(baremetal_custom PRIVATE ${BAREMETAL_PATH}) endif() @@ -33,6 +33,6 @@ foreach(model ${models}) get_filename_component(name ${model} NAME) ethosu_add_executable_test(baremetal_${name} PRIVATE SOURCES main.cpp - LIBRARIES $<$<TARGET_EXISTS:ethosu_monitor>:ethosu_monitor>) + LIBRARIES inference_process $<$<TARGET_EXISTS:ethosu_monitor>:ethosu_monitor>) target_include_directories(baremetal_${name} PRIVATE ${model}) endforeach()
\ No newline at end of file diff --git a/applications/freertos/CMakeLists.txt b/applications/freertos/CMakeLists.txt index 7bbfd97..34268f4 100644 --- a/applications/freertos/CMakeLists.txt +++ b/applications/freertos/CMakeLists.txt @@ -24,7 +24,7 @@ endif() ethosu_add_executable_test(freertos PRIVATE SOURCES main.cpp - LIBRARIES freertos_kernel) + LIBRARIES inference_process freertos_kernel) target_include_directories(freertos PRIVATE models/mobilenet_v2) # Use the fast memory to support both 11.12.57 and 11.13.x release diff --git a/applications/message_handler/lib/CMakeLists.txt b/applications/message_handler/lib/CMakeLists.txt index 4ea4010..c17742a 100644 --- a/applications/message_handler/lib/CMakeLists.txt +++ b/applications/message_handler/lib/CMakeLists.txt @@ -23,13 +23,13 @@ target_include_directories(message_handler_lib PUBLIC include target_link_libraries(message_handler_lib PUBLIC - ethosu_mailbox - $<$<TARGET_EXISTS:ethosu_core_driver>:ethosu_core_driver> + ethosu_mailbox + $<$<TARGET_EXISTS:ethosu_core_driver>:ethosu_core_driver> + inference_process PRIVATE - cmsis_device - freertos_kernel - inference_process - tflu) + cmsis_device + freertos_kernel + tflu) target_sources(message_handler_lib PRIVATE message_handler.cpp diff --git a/applications/threadx_demo/CMakeLists.txt b/applications/threadx_demo/CMakeLists.txt index dd3ad3a..ef20b57 100644 --- a/applications/threadx_demo/CMakeLists.txt +++ b/applications/threadx_demo/CMakeLists.txt @@ -25,7 +25,7 @@ endif() ethosu_add_executable_test(threadx_demo PRIVATE SOURCES main.cpp SOURCES tx_initialize_low_level.c - LIBRARIES threadx) + LIBRARIES inference_process threadx) target_include_directories(threadx_demo PRIVATE models/mobilenet_v2) # Use the fast memory to support both 11.12.57 and 11.13.x release diff --git a/applications/trustzone_inference/secure/CMakeLists.txt b/applications/trustzone_inference/secure/CMakeLists.txt index b1f84f3..d4b7735 100644 --- a/applications/trustzone_inference/secure/CMakeLists.txt +++ b/applications/trustzone_inference/secure/CMakeLists.txt @@ -31,7 +31,7 @@ set(TRUSTZONE_SIDE secure) ethosu_add_executable(trustzone_secure PRIVATE SOURCES main_secure.cpp mpc_sie_drv.c - LIBRARIES ethosu_target_init) + LIBRARIES ethosu_target_init inference_process) target_compile_definitions(trustzone_secure PUBLIC TRUSTZONE_BUILD) target_compile_definitions(trustzone_secure PUBLIC TRUSTZONE_SECURE) diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index 8e0a8c3..a21d9f0 100644 --- a/cmake/helpers.cmake +++ b/cmake/helpers.cmake @@ -96,7 +96,7 @@ function(ethosu_add_executable target) endif() target_link_libraries(${target} PRIVATE - ${ARGS_TARGET_LIBRARY} ethosu_core ${ARGS_LIBRARIES}) + ${ARGS_TARGET_LIBRARY} ${ARGS_LIBRARIES}) ethosu_eval_link_options(${target}) |