From 9c6f9f8afcb003fd72944918d6b6e200d68c0918 Mon Sep 17 00:00:00 2001 From: Kshitij Sisodia Date: Fri, 20 May 2022 14:30:02 +0100 Subject: MLECO-3225: Using official support for Arm Cortex-M85 CPU. * CMake version requirement bumped up to 3.21.0 * CMake 3.22.4 installed in the local Python virtualenv * CPU flags updated in toolchain files. * Using __ARM_FEATURE_DSP instead of potentially defining ARM_MATH_DSP wrongly. * CMake project version bumped up to 22.05.0 Changes also made for MLECO-3107 (pack generation): * TensorFlow Lite Micro CMSIS-pack version updated to 1.22.02. * Change to using __ARM_FEATURE_DSP will also help the generated pack. Partial changes for MLECO-3095: * CMSIS updated to version post 5.9.0 * TensorFlow Lite Micro updated to latest available * Ethos-U driver and core-platform repositories updated to 20.05_rc2 tags. Change-Id: I012c9e65897aed8ce589cff9bfe3a19efc3edeb9 Signed-off-by: Kshitij Sisodia --- scripts/cmake/platforms/mps3/build_configuration.cmake | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'scripts/cmake/platforms') diff --git a/scripts/cmake/platforms/mps3/build_configuration.cmake b/scripts/cmake/platforms/mps3/build_configuration.cmake index 6e21d9b..749b1e1 100644 --- a/scripts/cmake/platforms/mps3/build_configuration.cmake +++ b/scripts/cmake/platforms/mps3/build_configuration.cmake @@ -22,18 +22,7 @@ function(set_platform_global_defaults) if (TARGET_SUBSYSTEM STREQUAL sse-300) set(CMAKE_SYSTEM_PROCESSOR cortex-m55 CACHE STRING "Cortex-M CPU to use") elseif(TARGET_SUBSYSTEM STREQUAL sse-310) - # For CMake versions older than 3.21, the compiler and linker flags for - # ArmClang are added by CMake automatically which makes it mandatory to - # define the system processor. For CMake versions 3.21 or later (that - # implement policy CMP0123) we use armv8.1-m as the arch until the - # toolchain officially supports Cortex-M85. For older version of CMake - # we revert to using Cortex-M55 as the processor (as this will work - # for M85 too). - if(POLICY CMP0123) - set(CMAKE_SYSTEM_ARCH armv8.1-m.main CACHE STRING "System arch to use") - else() - set(CMAKE_SYSTEM_PROCESSOR cortex-m55) - endif() + set(CMAKE_SYSTEM_PROCESSOR cortex-m85 CACHE STRING "Cortex-M CPU to use") endif() endif() -- cgit v1.2.1