diff options
| author | Richard Burton <richard.burton@arm.com> | 2023-11-03 16:21:58 +0000 |
|---|---|---|
| committer | Richard <richard.burton@arm.com> | 2023-11-03 16:25:43 +0000 |
| commit | bcec675a9239ea021ad08dc937f0b7487eb62dba (patch) | |
| tree | 96a0dc8cd1ec65c649c0c835c98b760c9864d0d3 /source | |
| parent | daba3cf2e3633cbd0e4f8aabe7578b97e88deee1 (diff) | |
| download | ml-embedded-evaluation-kit-bcec675a9239ea021ad08dc937f0b7487eb62dba.tar.gz | |
MLECO-3640 MLECO-3678: Adding support for M85 in GCC
Signed-off-by: Richard Burton <richard.burton@arm.com>
Change-Id: I087e23f43b41fa0ef97ec7dcaeba807f6cba17e7
Diffstat (limited to 'source')
| -rw-r--r-- | source/application/api/common/include/ClassificationResult.hpp | 3 | ||||
| -rw-r--r-- | source/hal/source/platform/mps3/source/platform_drivers.c | 11 | ||||
| -rw-r--r-- | source/profiler/include/Profiler.hpp | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/source/application/api/common/include/ClassificationResult.hpp b/source/application/api/common/include/ClassificationResult.hpp index 244849f..704bb14 100644 --- a/source/application/api/common/include/ClassificationResult.hpp +++ b/source/application/api/common/include/ClassificationResult.hpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2021 Arm Limited and/or its affiliates <open-source-office@arm.com> + * SPDX-FileCopyrightText: Copyright 2021, 2023 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"); @@ -17,6 +17,7 @@ #ifndef CLASSIFICATION_RESULT_HPP #define CLASSIFICATION_RESULT_HPP +#include <cstdint> #include <string> namespace arm { diff --git a/source/hal/source/platform/mps3/source/platform_drivers.c b/source/hal/source/platform/mps3/source/platform_drivers.c index 7ebb770..73b388b 100644 --- a/source/hal/source/platform/mps3/source/platform_drivers.c +++ b/source/hal/source/platform/mps3/source/platform_drivers.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2022 Arm Limited and/or its affiliates <open-source-office@arm.com> + * SPDX-FileCopyrightText: Copyright 2022-2023 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"); @@ -149,13 +149,10 @@ static int verify_platform(void) if (EXTRACT_BITS(id, 7, 4) == 3) { info ("CPU: Cortex-M85 r%dp%d\n\n", EXTRACT_BITS(id, 23, 20),EXTRACT_BITS(id, 3, 0)); - /* @TODO: Remove CPU_CORTEX_M55 from here once CMake min version is > 3.21.0 or when - * toolchains officially support Cortex-M85. Currently, for CMake versions older than - * this, Cortex-M85 is built using Cortex-M55 flags. */ -#if defined (CPU_CORTEX_M55) || defined (ARMv81MML_DSP_DP_MVE_FP) || defined(CPU_CORTEX_M85) +#if defined (ARMv81MML_DSP_DP_MVE_FP) || defined (CPU_CORTEX_M85) /* CPU ID should be "0x_41_0f_d2_30" for Cortex-M85 */ return 0; -#endif /* (CPU_CORTEX_M55) || (ARMv81MML_DSP_DP_MVE_FP) || (CPU_CORTEX_M85) */ +#endif /* (ARMv81MML_DSP_DP_MVE_FP) || (CPU_CORTEX_M85) */ } else if (EXTRACT_BITS(id, 7, 4) == 2) { info ("CPU: Cortex-M55 r%dp%d\n\n", EXTRACT_BITS(id, 23, 20),EXTRACT_BITS(id, 3, 0)); @@ -185,7 +182,7 @@ static int verify_platform(void) EXTRACT_BITS(id, 3, 0)); } - /* If the CPU is anything other than M33 or M55, we return 1 */ + /* If the CPU is anything other than M33, M55 or M85, we return 1 */ printf_err("CPU mismatch!\n"); return 1; } diff --git a/source/profiler/include/Profiler.hpp b/source/profiler/include/Profiler.hpp index 8ae9e15..8c2a61c 100644 --- a/source/profiler/include/Profiler.hpp +++ b/source/profiler/include/Profiler.hpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright 2022 Arm Limited and/or its affiliates <open-source-office@arm.com> + * SPDX-FileCopyrightText: Copyright 2022-2023 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"); @@ -19,6 +19,7 @@ #include "hal.h" +#include <cstdint> #include <string> #include <map> #include <vector> |