commit b4123fd715e41070be5bb39600625c740185f562
author Richard Burton <richard.burton@arm.com> Fri Mar 04 09:19:09 2022 +0000
committer Richard <richard.burton@arm.com> Fri Mar 04 09:45:29 2022 +0000
tree 78ff9672a8adcdd9d97b40a3de17a6985b1a6659
parent 2aa31324349f64ac1a6596006c6c88dcbc596a49

MLECO-2978: Update to 22.02 dependencies

* Core-platform now a depdenency for timing adapter

Signed-off-by: Richard Burton <richard.burton@arm.com>
Change-Id: I54f3773bdf91083fa1513be15372fcf2231bea2c

scripts/cmake/tensorflow.cmake

diff --git a/scripts/cmake/tensorflow.cmake b/scripts/cmake/tensorflow.cmake
index 284c70a..127724b 100644
--- a/scripts/cmake/tensorflow.cmake
+++ b/scripts/cmake/tensorflow.cmake
@@ -54,7 +54,7 @@
     if(ETHOS_U_NPU_ENABLED)
         # Arm Ethos-U55 NPU is the co-processor for ML workload:
         set(TENSORFLOW_LITE_MICRO_CO_PROCESSOR  "ethos_u")
-        string(TOLOWER ${ETHOS_U_NPU_ID} ETHOSU_ARCH)
+        set(ETHOS_U_NPU_ID "u55")  # Currently only u55 is supported by TFLite Micro.
     endif()
 
     set(TENSORFLOW_LITE_MICRO_OPTIMIZED_KERNEL  "cmsis_nn")
@@ -68,10 +68,6 @@
     list(APPEND MAKE_TARGETS_LIST "clean")
 endif()
 
-if (ETHOS_U_NPU_ID)
-    string(TOLOWER ${ETHOS_U_NPU_ID} ETHOSU_ARCH)
-endif()
-
 # Primary target
 list(APPEND MAKE_TARGETS_LIST "microlite")
 message(STATUS "TensorFlow Lite Micro build to be called for these targets: ${MAKE_TARGETS_LIST}")
@@ -89,7 +85,7 @@
         BUILD_TYPE=${TENSORFLOW_LITE_MICRO_BUILD_TYPE}
         CMSIS_PATH=${CMSIS_SRC_PATH}
         # Conditional arguments
-        $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_ARCH=${ETHOSU_ARCH}>
+        $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_ARCH=${ETHOS_U_NPU_ID}>
         $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_DRIVER_PATH=${ETHOS_U_NPU_DRIVER_SRC_PATH}>
         $<$<BOOL:${ETHOS_U_NPU_ENABLED}>:ETHOSU_DRIVER_LIBS=$<TARGET_FILE:ethosu_core_driver>>