mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-06 06:04:33 +02:00
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.
This commit is contained in:
@@ -19,25 +19,21 @@ set(as_version ${CMAKE_MATCH_1})
|
|||||||
|
|
||||||
message(STATUS "Building ULP app ${ULP_APP_NAME}")
|
message(STATUS "Building ULP app ${ULP_APP_NAME}")
|
||||||
|
|
||||||
if(ULP_COCPU_IS_RISCV)
|
# Check the supported assembler version
|
||||||
set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/ulp_riscv.ld)
|
if(NOT ULP_COCPU_IS_RISCV)
|
||||||
else()
|
|
||||||
message(STATUS "ULP assembler version: ${as_version}")
|
message(STATUS "ULP assembler version: ${as_version}")
|
||||||
|
set(as_supported_version 2.28.51-esp-20191205)
|
||||||
# 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})
|
|
||||||
|
|
||||||
if(NOT as_version STREQUAL as_supported_version)
|
if(NOT as_version STREQUAL as_supported_version)
|
||||||
message(WARNING "WARNING: ULP assembler version ${as_version} is not supported. Expected to see 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 \
|
${as_supported_version}. Please check ESP-IDF ULP setup instructions and update \
|
||||||
the toolchain, or proceed at your own risk.")
|
the toolchain, or proceed at your own risk.")
|
||||||
endif()
|
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)
|
set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/ulp_fsm.ld)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
SUPPORTED_ULP_ASSEMBLER_VERSION = 2.28.51-esp-20191205
|
|
Reference in New Issue
Block a user