Simplify timing-adapter settings
The targets only have one NPU so simplify the timing adapters settings
by removing unnecessary nesting and complexity.
Corstone-310 does not have timing adapters in the NPU model, so remove
that dead timing adapter code completely.
Change-Id: Iabe95c5e6354f5168beefa3ddfff4a348c4a7021
Signed-off-by: Jonny Svärd <jonny.svaerd@arm.com>
diff --git a/targets/corstone-300/CMakeLists.txt b/targets/corstone-300/CMakeLists.txt
index 62205bb..9f8ed36 100644
--- a/targets/corstone-300/CMakeLists.txt
+++ b/targets/corstone-300/CMakeLists.txt
@@ -1,6 +1,5 @@
#
-# SPDX-FileCopyrightText: Copyright 2020-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
-#
+# SPDX-FileCopyrightText: Copyright 2020-2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the License); you may
@@ -27,8 +26,6 @@
endif()
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")
set(ETHOSU_PMU_EVENT_0 -1 CACHE STRING "PMU Event #0")
set(ETHOSU_PMU_EVENT_1 -1 CACHE STRING "PMU Event #1")
@@ -81,10 +78,6 @@
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../common target)
target_compile_definitions(ethosu_target_common INTERFACE
- # Configure NPU architecture and number of timing adapters
- ETHOSU_NPU_COUNT=${ETHOSU_TARGET_NPU_COUNT}
- ETHOSU_NPU_TA_COUNT=${ETHOSU_TARGET_NPU_TA_COUNT}
-
# Configure PMU events
ETHOSU_PMU_EVENT_0=${ETHOSU_PMU_EVENT_0}
ETHOSU_PMU_EVENT_1=${ETHOSU_PMU_EVENT_1}