diff options
| author | Isabella Gottardi <isabella.gottardi@arm.com> | 2021-07-21 10:35:08 +0100 |
|---|---|---|
| committer | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2021-08-13 12:55:24 +0100 |
| commit | c5d8bda3c6f743ec2725bf281874d4b6431122c3 (patch) | |
| tree | 33b20cfc9c9dcbbd2e424c81b59eefd07de4db6c /scripts | |
| parent | 0d110594b8a50ce3311be5187f01de2e3b8fe995 (diff) | |
| download | ml-embedded-evaluation-kit-c5d8bda3c6f743ec2725bf281874d4b6431122c3.tar.gz | |
MLECO-1982: Update to using latest ethos-u embedded components
Change-Id: I744a4eb2553207004c9403b956e5bd9e9b352bfb
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/toolchains/bare-metal-armclang.cmake | 2 | ||||
| -rw-r--r-- | scripts/make/cortex_m_ethos_eval_makefile.inc | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/scripts/cmake/toolchains/bare-metal-armclang.cmake b/scripts/cmake/toolchains/bare-metal-armclang.cmake index 0a86eb6..d07aa9e 100644 --- a/scripts/cmake/toolchains/bare-metal-armclang.cmake +++ b/scripts/cmake/toolchains/bare-metal-armclang.cmake @@ -25,7 +25,7 @@ set(CMAKE_ASM_COMPILER_AR armar) set(CMAKE_CROSSCOMPILING true) set(CMAKE_SYSTEM_NAME Generic) -set(MIN_ARM_CLANG_VERSION 6.14) +set(MIN_ARM_CLANG_VERSION 6.15) # Skip compiler test execution set(CMAKE_C_COMPILER_WORKS 1) diff --git a/scripts/make/cortex_m_ethos_eval_makefile.inc b/scripts/make/cortex_m_ethos_eval_makefile.inc index dbb460d..407bc85 100644 --- a/scripts/make/cortex_m_ethos_eval_makefile.inc +++ b/scripts/make/cortex_m_ethos_eval_makefile.inc @@ -117,12 +117,6 @@ ifeq ($(TARGET),$(filter $(TARGET), cortex_m_ethos_eval)) MICROLITE_LIBS := $(filter-out -lm,$(MICROLITE_LIBS)) else ifeq ($(TOOLCHAIN), gcc) - export PATH := $(MAKEFILE_DIR)/downloads/gcc_embedded/bin/:$(PATH) - DOWNLOAD_RESULT := $(shell $(MAKEFILE_DIR)/arm_gcc_download.sh ${MAKEFILE_DIR}/downloads) - ifneq ($(DOWNLOAD_RESULT), SUCCESS) - $(error Something went wrong with the GCC download: $(DOWNLOAD_RESULT)) - endif - TARGET_TOOLCHAIN_PREFIX := arm-none-eabi- FLAGS_GCC = -mcpu=$(GCC_TARGET_ARCH) -mfpu=auto @@ -133,6 +127,16 @@ ifeq ($(TARGET),$(filter $(TARGET), cortex_m_ethos_eval)) $(error "TOOLCHAIN=$(TOOLCHAIN) is not supported.") endif +# TODO(#47718): resolve warnings. +CXX_OMIT_ERRORS = \ + -Wno-implicit-fallthrough \ + -Wno-unused-variable + +# TODO: Remove when Arm Ethos-U NPU driver is updated to version > 21.05 +CC_OMIT_ERRORS = \ + ${CXX_OMIT_ERRORS} \ + -Wno-int-conversion + PLATFORM_FLAGS = \ -DTF_LITE_MCU_DEBUG_LOG \ -mthumb \ @@ -147,7 +151,7 @@ ifeq ($(TARGET),$(filter $(TARGET), cortex_m_ethos_eval)) $(TARGET_SPECIFIC_FLAGS) # Common + C/C++ flags - CXXFLAGS += $(PLATFORM_FLAGS) - CCFLAGS += $(PLATFORM_FLAGS) + CXXFLAGS += $(PLATFORM_FLAGS) ${CXX_OMIT_ERRORS} + CCFLAGS += $(PLATFORM_FLAGS) ${CC_OMIT_ERRORS} endif |