diff options
| author | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2024-01-17 13:29:43 +0000 |
|---|---|---|
| committer | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2024-01-18 10:38:57 +0000 |
| commit | 5385a64979c0380b60c57c74878ccb5189012c87 (patch) | |
| tree | ba1879bb56501eae9334da379d3014ae99fd01fb /scripts/cmake | |
| parent | 001a8ff315dc766a206b05a3e00e831e3f972b0d (diff) | |
| download | ml-embedded-evaluation-kit-5385a64979c0380b60c57c74878ccb5189012c87.tar.gz | |
Cleanup: Timing adapter definitions
The NPU timing adapter base addresses had been defined in mutiple
places, making it difficult to determine which one is actually being
used. This patch cleans up unused definitions from memory-map header
files for different targets and the CMake template files.
The expectation is for component base addresses to be set by platform
specific CMake files that include/wrap the component directories.
Change-Id: Ic39794ffbdb872b4b0c900cbcec8e386bb32c4eb
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/timing_adapter/ta_config_u55_high_end.cmake | 12 | ||||
| -rw-r--r-- | scripts/cmake/timing_adapter/ta_config_u65_high_end.cmake | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/scripts/cmake/timing_adapter/ta_config_u55_high_end.cmake b/scripts/cmake/timing_adapter/ta_config_u55_high_end.cmake index 6fca4b3..37785e3 100644 --- a/scripts/cmake/timing_adapter/ta_config_u55_high_end.cmake +++ b/scripts/cmake/timing_adapter/ta_config_u55_high_end.cmake @@ -1,5 +1,6 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021 Arm Limited and/or its affiliates <open-source-office@arm.com> +# SPDX-FileCopyrightText: Copyright 2021, 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"); @@ -16,12 +17,15 @@ #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# CMake description file for the Ethos-U55 Timing Adapter settings (single +# CMake description file for the Arm Ethos-U55 Timing Adapter settings (single # NPU core with two AXIs). #---------------------------------------------------------------------------- -set(TA0_BASE "${SEC_ETHOS_U_NPU_TA0_BASE}" CACHE STRING "Timing adapter 0: base-address") -set(TA1_BASE "${SEC_ETHOS_U_NPU_TA1_BASE}" CACHE STRING "Timing adapter 1: base-address") +# The platform CMake infra should set the base register values for +# TA component to work. For Ethos-U55, we need two base addresses. +if (NOT DEFINED TA0_BASE OR NOT DEFINED TA1_BASE) + message(FATAL_ERROR "TA0_BASE and TA1_BASE need to be defined.") +endif () message(STATUS "using TA0_BASE @ ${TA0_BASE}; TA1_BASE @ ${TA1_BASE}.") diff --git a/scripts/cmake/timing_adapter/ta_config_u65_high_end.cmake b/scripts/cmake/timing_adapter/ta_config_u65_high_end.cmake index 9edf66e..e29d144 100644 --- a/scripts/cmake/timing_adapter/ta_config_u65_high_end.cmake +++ b/scripts/cmake/timing_adapter/ta_config_u65_high_end.cmake @@ -1,5 +1,6 @@ #---------------------------------------------------------------------------- -# SPDX-FileCopyrightText: Copyright 2021 Arm Limited and/or its affiliates <open-source-office@arm.com> +# SPDX-FileCopyrightText: Copyright 2021, 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"); @@ -16,12 +17,15 @@ #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -# CMake description file for the Ethos-U55 Timing Adapter settings (single +# CMake description file for the Arm Ethos-U65 Timing Adapter settings (single # NPU core with two AXIs). #---------------------------------------------------------------------------- -set(TA0_BASE "${SEC_ETHOS_U_NPU_TA0_BASE}" CACHE STRING "Timing adapter 0: base-address") -set(TA1_BASE "${SEC_ETHOS_U_NPU_TA1_BASE}" CACHE STRING "Timing adapter 1: base-address") +# The platform CMake infra should set the base register values for +# TA component to work. For Ethos-U65, we need two base addresses. +if (NOT DEFINED TA0_BASE OR NOT DEFINED TA1_BASE) + message(FATAL_ERROR "TA0_BASE and TA1_BASE need to be defined.") +endif () message(STATUS "using TA0_BASE @ ${TA0_BASE}; TA1_BASE @ ${TA1_BASE}.") |