From 1a73374f8277c4c4e8fd87cfbcab19a766101dd4 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Sun, 28 Aug 2022 13:47:12 +0200 Subject: [PATCH] ulp: move the expected ULP-FSM toolchain version from .mk to CMake toolchain_ulp_version.mk is a remnant of the time when we had two build systems, and CMake had to read the expected version from a makefile. --- components/ulp/cmake/CMakeLists.txt | 18 +++++++----------- components/ulp/toolchain_ulp_version.mk | 1 - 2 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 components/ulp/toolchain_ulp_version.mk diff --git a/components/ulp/cmake/CMakeLists.txt b/components/ulp/cmake/CMakeLists.txt index db665973fe..732ae8e4a3 100644 --- a/components/ulp/cmake/CMakeLists.txt +++ b/components/ulp/cmake/CMakeLists.txt @@ -19,25 +19,21 @@ set(as_version ${CMAKE_MATCH_1}) message(STATUS "Building ULP app ${ULP_APP_NAME}") -if(ULP_COCPU_IS_RISCV) - set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/ulp_riscv.ld) -else() +# Check the supported assembler version +if(NOT ULP_COCPU_IS_RISCV) message(STATUS "ULP assembler version: ${as_version}") - - # Check the supported assembler version - file(STRINGS ${IDF_PATH}/components/ulp/toolchain_ulp_version.mk version_file_contents) - string(REGEX MATCH - "SUPPORTED_ULP_ASSEMBLER_VERSION = (${version_pattern})" - as_supported_version - ${version_file_contents}) - set(as_supported_version ${CMAKE_MATCH_1}) + set(as_supported_version 2.28.51-esp-20191205) if(NOT as_version STREQUAL as_supported_version) message(WARNING "WARNING: ULP assembler version ${as_version} is not supported. Expected to see version: \ ${as_supported_version}. Please check ESP-IDF ULP setup instructions and update \ the toolchain, or proceed at your own risk.") endif() +endif() +if(ULP_COCPU_IS_RISCV) + set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/ulp_riscv.ld) +else() set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/ulp_fsm.ld) endif() diff --git a/components/ulp/toolchain_ulp_version.mk b/components/ulp/toolchain_ulp_version.mk deleted file mode 100644 index d835600e43..0000000000 --- a/components/ulp/toolchain_ulp_version.mk +++ /dev/null @@ -1 +0,0 @@ -SUPPORTED_ULP_ASSEMBLER_VERSION = 2.28.51-esp-20191205