MLECO-2592: Moving to latest stack of dependencies

* Currently using 21.11 release candidates

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

8 files changed, 10 insertions, 5 deletions

diff --git a/dependencies/cmsis b/dependencies/cmsis
-Subproject c43379be65dec9d808b72b8efbe52cad762909b
+Subproject 72cdcc54902bf702f79c91e8ab172e28ac568f3
diff --git a/dependencies/core-driver b/dependencies/core-driver
-Subproject 6eab40b2051882833dd446cd56ba7c17a5f7082
+Subproject 089a34786cbe02863eaa79f39dc92bf061dfcda
diff --git a/dependencies/core-software b/dependencies/core-software
-Subproject 3bd342372638b185d097308445747a1a668fce0
+Subproject eb912395c25fbdeef4f322d7aea922657822818
diff --git a/dependencies/tensorflow b/dependencies/tensorflow
-Subproject 4e091a46e935afcb27035e538044e37892d4a98
+Subproject 1a23ad6adf007ad6ef3826523f41ff43fb686a1
diff --git a/download_dependencies.py b/download_dependencies.py
index dbdeffb..ee8ed54 100755
--- a/download_dependencies.py
+++ b/download_dependencies.py
@@ -25,10 +25,10 @@ import tempfile
 from urllib.request import urlopen
 from zipfile import ZipFile
 
-tf = "https://github.com/tensorflow/tflite-micro/archive/4e091a46e935afcb27035e538044e37892d4a983.zip"
-cmsis = "https://github.com/ARM-software/CMSIS_5/archive/c43379be65dec9d808b72b8efbe52cad762909be.zip"
-ethos_u_core_sw = "https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git/snapshot/ethos-u-core-software-21.08.tar.gz"
-ethos_u_core_driver = "https://git.mlplatform.org/ml/ethos-u/ethos-u-core-driver.git/snapshot/ethos-u-core-driver-21.08.tar.gz"
+tf = "https://github.com/tensorflow/tflite-micro/archive/1a23ad6adf007ad6ef3826523f41ff43fb686a13.zip"
+cmsis = "https://github.com/ARM-software/CMSIS_5/archive/72cdcc54902bf702f79c91e8ab172e28ac568f3e.zip"
+ethos_u_core_sw = "https://git.mlplatform.org/ml/ethos-u/ethos-u-core-software.git/snapshot/ethos-u-core-software-21.11-rc2.tar.gz"
+ethos_u_core_driver = "https://git.mlplatform.org/ml/ethos-u/ethos-u-core-driver.git/snapshot/ethos-u-core-driver-21.11-rc2.tar.gz"
 
 
 def download(url_file: str, post_process=None):
diff --git a/scripts/cmake/tensorflow.cmake b/scripts/cmake/tensorflow.cmake
index 8ebac28..665c73d 100644
--- a/scripts/cmake/tensorflow.cmake
+++ b/scripts/cmake/tensorflow.cmake
@@ -73,6 +73,10 @@ if (TENSORFLOW_LITE_MICRO_CLEAN_BUILD)
     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}")
@@ -90,6 +94,7 @@ add_custom_target(tensorflow_build ALL
         BUILD_TYPE=${TENSORFLOW_LITE_MICRO_BUILD_TYPE}
         ETHOSU_DRIVER_PATH=${ETHOS_U_NPU_DRIVER_SRC_PATH}
         CMSIS_PATH=${CMSIS_SRC_PATH}
+        ETHOSU_ARCH=${ETHOSU_ARCH}
 
         # Conditional arguments
         $<$<BOOL:${ARMCLANG_DEBUG_DWARF_LEVEL}>:ARMCLANG_DEBUG_DWARF_LEVEL=${ARMCLANG_DEBUG_DWARF_LEVEL}>
diff --git a/scripts/make/cortex_m_ethos_eval_makefile.inc b/scripts/make/cortex_m_ethos_eval_makefile.inc
index 27bb9d6..234534a 100644
--- a/scripts/make/cortex_m_ethos_eval_makefile.inc
+++ b/scripts/make/cortex_m_ethos_eval_makefile.inc
@@ -139,6 +139,7 @@ ifeq ($(TARGET),$(filter $(TARGET), cortex_m_ethos_eval))
     -fomit-frame-pointer \
     -MD \
     -DCPU_CORTEX_$(CORE)=1 \
+    -DETHOSU_ARCH=${ETHOSU_ARCH} \
     $(TARGET_SPECIFIC_FLAGS)
 
   # Common + C/C++ flags
diff --git a/source/application/hal/hal.c b/source/application/hal/hal.c
index 53a304b..c067ba2 100644
--- a/source/application/hal/hal.c
+++ b/source/application/hal/hal.c
@@ -283,7 +283,6 @@ static int arm_npu_init(void)
                                     driver_version.patch);
     info("\tMACs/cc:    %"PRIu32"\n", (uint32_t)(1 << hw_info.cfg.macs_per_cc));
     info("\tCmd stream: v%"PRIu32"\n", hw_info.cfg.cmd_stream_version);
-    info("\tSHRAM size: %"PRIu32"\n", hw_info.cfg.shram_size);
 
     return 0;
 }