From 931758110c26b9d8909e7aa7c7354efb4441b703 Mon Sep 17 00:00:00 2001 From: Kristofer Jonsson Date: Thu, 21 Apr 2022 19:27:11 +0200 Subject: Add Corstone-310 target Change-Id: Idcb2238895668ee4858c2e858c02c6765f4b1702 --- applications/freertos/CMakeLists.txt | 9 +++++---- applications/threadx_demo/CMakeLists.txt | 8 +++++--- applications/trustzone_inference/secure/CMakeLists.txt | 8 +++++--- 3 files changed, 15 insertions(+), 10 deletions(-) (limited to 'applications') diff --git a/applications/freertos/CMakeLists.txt b/applications/freertos/CMakeLists.txt index 610f0e5..7bbfd97 100644 --- a/applications/freertos/CMakeLists.txt +++ b/applications/freertos/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Arm Limited. All rights reserved. +# Copyright (c) 2021-2022 Arm Limited. # # SPDX-License-Identifier: Apache-2.0 # @@ -29,6 +29,7 @@ target_include_directories(freertos PRIVATE models/mobilenet_v2) # Use the fast memory to support both 11.12.57 and 11.13.x release # of the FVP -# The size is defined to force the .bss.tensor_arena to be placed in DDR -target_compile_definitions( - freertos PRIVATE ETHOSU_FAST_MEMORY_SIZE=0xa0000) +target_compile_options(freertos PRIVATE + -UETHOSU_FAST_MEMORY_SIZE -DETHOSU_FAST_MEMORY_SIZE=0xa0000 + -UETHOSU_ARENA -DETHOSU_ARENA=1 + -UETHOSU_MODEL -DETHOSU_MODEL=1) diff --git a/applications/threadx_demo/CMakeLists.txt b/applications/threadx_demo/CMakeLists.txt index dbc56d2..c18d739 100644 --- a/applications/threadx_demo/CMakeLists.txt +++ b/applications/threadx_demo/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Arm Limited. All rights reserved. +# Copyright (c) 2021-2022 Arm Limited. # # SPDX-License-Identifier: Apache-2.0 # @@ -31,5 +31,7 @@ target_include_directories(threadx_demo PRIVATE models/mobilenet_v2) # Use the fast memory to support both 11.12.57 and 11.13.x release # of the FVP # The size is defined to force the .bss.tensor_arena to be placed in DDR -target_compile_definitions( - threadx_demo PRIVATE ETHOSU_FAST_MEMORY_SIZE=0xa0000) +target_compile_options(threadx_demo PRIVATE + -UETHOSU_FAST_MEMORY_SIZE -DETHOSU_FAST_MEMORY_SIZE=0xa0000 + -UETHOSU_ARENA -DETHOSU_ARENA=1 + -UETHOSU_MODEL -DETHOSU_MODEL=1) diff --git a/applications/trustzone_inference/secure/CMakeLists.txt b/applications/trustzone_inference/secure/CMakeLists.txt index 1e4a98b..b1f84f3 100644 --- a/applications/trustzone_inference/secure/CMakeLists.txt +++ b/applications/trustzone_inference/secure/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Arm Limited. All rights reserved. +# Copyright (c) 2021-2022 Arm Limited. # # SPDX-License-Identifier: Apache-2.0 # @@ -38,8 +38,10 @@ target_compile_definitions(trustzone_secure PUBLIC TRUSTZONE_SECURE) # Use the fast memory to support both 11.12.57 and 11.13.x release # of the FVP -target_compile_definitions( - trustzone_secure PUBLIC ETHOSU_FAST_MEMORY_SIZE=0xa0000) +target_compile_options(trustzone_secure PUBLIC + -UETHOSU_FAST_MEMORY_SIZE -DETHOSU_FAST_MEMORY_SIZE=0xa0000 + -UETHOSU_ARENA -DETHOSU_ARENA=1 + -UETHOSU_MODEL -DETHOSU_MODEL=1) target_compile_options(trustzone_secure PUBLIC -mcmse) -- cgit v1.2.1