From b1387fb7cb1761fdebd692f5d63f0be9fc2ccbe0 Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Mon, 29 Aug 2022 22:01:20 +0400 Subject: [PATCH] tools: update esp32ulp-elf to v2.35_20220830 Closes https://github.com/espressif/esp-idf/issues/6432 Closes https://github.com/espressif/binutils-esp32ulp/issues/23 --- components/ulp/cmake/CMakeLists.txt | 11 +- .../ulp/cmake/toolchain-esp32-ulp.cmake | 7 +- .../ulp/cmake/toolchain-esp32s2-ulp.cmake | 8 +- .../ulp/cmake/toolchain-esp32s3-ulp.cmake | 12 +- components/ulp/toolchain_ulp_version.mk | 1 - docs/en/api-guides/tools/idf-tools-notes.inc | 5 - docs/en/api-reference/system/ulp.rst | 2 +- .../api-guides/tools/idf-tools-notes.inc | 5 - docs/zh_CN/api-reference/system/ulp.rst | 2 +- tools/test_idf_tools/test_idf_tools.py | 49 ++---- tools/tools.json | 143 +++++------------- 11 files changed, 63 insertions(+), 182 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 028dfdeb98..45caeb35e9 100644 --- a/components/ulp/cmake/CMakeLists.txt +++ b/components/ulp/cmake/CMakeLists.txt @@ -5,7 +5,7 @@ project(${ULP_APP_NAME} ASM C) option(ULP_COCPU_IS_RISCV "Use RISC-V based ULP" OFF) -set(version_pattern "[a-z0-9\.-]+") +set(version_pattern "[a-z0-9\.-_]+") # Check assembler version execute_process( @@ -23,14 +23,7 @@ if(ULP_COCPU_IS_RISCV) set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/ulp_riscv.ld) else() 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.35_20220830) if(NOT as_version STREQUAL as_supported_version) message(WARNING "WARNING: ULP assembler version ${as_version} is not supported. Expected to see version: \ diff --git a/components/ulp/cmake/toolchain-esp32-ulp.cmake b/components/ulp/cmake/toolchain-esp32-ulp.cmake index 56d53c07fb..401de56062 100644 --- a/components/ulp/cmake/toolchain-esp32-ulp.cmake +++ b/components/ulp/cmake/toolchain-esp32-ulp.cmake @@ -1,19 +1,16 @@ # CMake toolchain file for ULP - set(CMAKE_SYSTEM_NAME Generic) # Compiler is only used for preprocessing set(CMAKE_C_COMPILER "xtensa-esp32-elf-gcc") +set(CMAKE_CXX_COMPILER "xtensa-esp32-elf-g++") set(CMAKE_ASM_COMPILER "esp32ulp-elf-as") set(CMAKE_LINKER "esp32ulp-elf-ld") -if(NOT ASM_DIALECT) - set(ASM_DIALECT "") -endif() set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \ - -o -c ") + --mcpu=esp32 -o -c ") set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32ulp -nostdlib" CACHE STRING "ULP Linker Base Flags") set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} \ -o ") diff --git a/components/ulp/cmake/toolchain-esp32s2-ulp.cmake b/components/ulp/cmake/toolchain-esp32s2-ulp.cmake index 4383d5432a..a2f81eb832 100644 --- a/components/ulp/cmake/toolchain-esp32s2-ulp.cmake +++ b/components/ulp/cmake/toolchain-esp32s2-ulp.cmake @@ -1,15 +1,15 @@ # CMake toolchain file for ULP - set(CMAKE_SYSTEM_NAME Generic) # Compiler is only used for preprocessing set(CMAKE_C_COMPILER "xtensa-esp32s2-elf-gcc") +set(CMAKE_CXX_COMPILER "xtensa-esp32s2-elf-g++") -set(CMAKE_ASM_COMPILER "esp32s2ulp-elf-as") -set(CMAKE_LINKER "esp32s2ulp-elf-ld") +set(CMAKE_ASM_COMPILER "esp32ulp-elf-as") +set(CMAKE_LINKER "esp32ulp-elf-ld") set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \ - -o -c ") + --mcpu=esp32s2 -o -c ") set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32s2ulp -nostdlib" CACHE STRING "ULP Linker Base Flags") set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} \ -o ") diff --git a/components/ulp/cmake/toolchain-esp32s3-ulp.cmake b/components/ulp/cmake/toolchain-esp32s3-ulp.cmake index 4f1995966a..0e2c218509 100644 --- a/components/ulp/cmake/toolchain-esp32s3-ulp.cmake +++ b/components/ulp/cmake/toolchain-esp32s3-ulp.cmake @@ -1,16 +1,16 @@ # CMake toolchain file for ULP - set(CMAKE_SYSTEM_NAME Generic) # Compiler is only used for preprocessing -#TODO: Update toolchain to be used once esp32s3 support is added to binutils -set(CMAKE_C_COMPILER "xtensa-esp32s2-elf-gcc") +set(CMAKE_C_COMPILER "xtensa-esp32s3-elf-gcc") +set(CMAKE_CXX_COMPILER "xtensa-esp32s3-elf-g++") -set(CMAKE_ASM_COMPILER "esp32s2ulp-elf-as") -set(CMAKE_LINKER "esp32s2ulp-elf-ld") +set(CMAKE_ASM_COMPILER "esp32ulp-elf-as") +set(CMAKE_LINKER "esp32ulp-elf-ld") +# Use ESP32-S2 ULP tools here, because ESP32-S3 uses the same ULP coprocessor type set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \ - -o -c ") + --mcpu=esp32s2 -o -c ") set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32s2ulp -nostdlib" CACHE STRING "ULP Linker Base Flags") set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} \ -o ") 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 diff --git a/docs/en/api-guides/tools/idf-tools-notes.inc b/docs/en/api-guides/tools/idf-tools-notes.inc index 99ed36d383..3f5fa241a0 100644 --- a/docs/en/api-guides/tools/idf-tools-notes.inc +++ b/docs/en/api-guides/tools/idf-tools-notes.inc @@ -35,11 +35,6 @@ .. tool-esp32ulp-elf-notes ---- - -.. tool-esp32s2ulp-elf-notes - - --- .. tool-openocd-esp32-notes diff --git a/docs/en/api-reference/system/ulp.rst b/docs/en/api-reference/system/ulp.rst index 6349bf2e42..665b5176a0 100644 --- a/docs/en/api-reference/system/ulp.rst +++ b/docs/en/api-reference/system/ulp.rst @@ -184,4 +184,4 @@ API Reference .. include-build-file:: inc/ulp_common.inc .. include-build-file:: inc/ulp_common_defs.inc -.. _binutils-esp32ulp toolchain: https://github.com/espressif/binutils-esp32ulp +.. _binutils-esp32ulp toolchain: https://github.com/espressif/binutils-gdb diff --git a/docs/zh_CN/api-guides/tools/idf-tools-notes.inc b/docs/zh_CN/api-guides/tools/idf-tools-notes.inc index 5af2e9a693..6f03f311af 100644 --- a/docs/zh_CN/api-guides/tools/idf-tools-notes.inc +++ b/docs/zh_CN/api-guides/tools/idf-tools-notes.inc @@ -37,11 +37,6 @@ .. tool-esp32ulp-elf-notes ---- - -.. tool-esp32s2ulp-elf-notes - - --- .. tool-openocd-esp32-notes diff --git a/docs/zh_CN/api-reference/system/ulp.rst b/docs/zh_CN/api-reference/system/ulp.rst index 36ef43741f..66f6ce7a0d 100644 --- a/docs/zh_CN/api-reference/system/ulp.rst +++ b/docs/zh_CN/api-reference/system/ulp.rst @@ -184,4 +184,4 @@ API 参考 .. include-build-file:: inc/ulp_common.inc .. include-build-file:: inc/ulp_common_defs.inc -.. _binutils-esp32ulp 工具链: https://github.com/espressif/binutils-esp32ulp +.. _binutils-esp32ulp 工具链: https://github.com/espressif/binutils-gdb diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py index 6385ceb38a..44a6eb0ac2 100755 --- a/tools/test_idf_tools/test_idf_tools.py +++ b/tools/test_idf_tools/test_idf_tools.py @@ -38,9 +38,6 @@ except ImportError: import idf_tools ESP32ULP = 'esp32ulp-elf' -ESP32ULP_ARCHIVE = 'binutils-esp32ulp' -ESP32S2ULP = 'esp32s2ulp-elf' -ESP32S2ULP_ARCHIVE = 'binutils-esp32s2ulp' OPENOCD = 'openocd-esp32' RISCV_ELF = 'riscv32-esp-elf' XTENSA_ESP32_ELF = 'xtensa-esp32-elf' @@ -66,7 +63,6 @@ def get_version_dict(): version_dict = get_version_dict() ESP32ULP_VERSION = version_dict[ESP32ULP] -ESP32S2ULP_VERSION = version_dict[ESP32S2ULP] OPENOCD_VERSION = version_dict[OPENOCD] RISCV_ELF_VERSION = version_dict[RISCV_ELF] XTENSA_ESP32_ELF_VERSION = version_dict[XTENSA_ESP32_ELF] @@ -136,8 +132,6 @@ class TestUsage(unittest.TestCase): output = self.run_idf_tools_with_action(['list']) self.assertIn('* %s:' % ESP32ULP, output) self.assertIn('- %s (recommended)' % ESP32ULP_VERSION, output) - self.assertIn('* %s:' % ESP32S2ULP, output) - self.assertIn('- %s (recommended)' % ESP32S2ULP_VERSION, output) self.assertIn('* %s:' % OPENOCD, output) self.assertIn('- %s (recommended)' % OPENOCD_VERSION, output) self.assertIn('* %s:' % RISCV_ELF, output) @@ -149,15 +143,14 @@ class TestUsage(unittest.TestCase): self.assertIn('* %s:' % XTENSA_ESP32S3_ELF, output) self.assertIn('- %s (recommended)' % XTENSA_ESP32S3_ELF_VERSION, output) - required_tools_installed = 9 + required_tools_installed = 8 output = self.run_idf_tools_with_action(['install']) self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION) self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION) self.assert_tool_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION) self.assert_tool_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION) self.assert_tool_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION) - self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE) - self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE) + self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION) self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION) self.assert_tool_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION) self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output) @@ -165,7 +158,6 @@ class TestUsage(unittest.TestCase): output = self.run_idf_tools_with_action(['check']) self.assertIn('version installed in tools directory: ' + ESP32ULP_VERSION, output) - self.assertIn('version installed in tools directory: ' + ESP32S2ULP_VERSION, output) self.assertIn('version installed in tools directory: ' + OPENOCD_VERSION, output) self.assertIn('version installed in tools directory: ' + RISCV_ELF_VERSION, output) self.assertIn('version installed in tools directory: ' + XTENSA_ESP32_ELF_VERSION, output) @@ -175,7 +167,7 @@ class TestUsage(unittest.TestCase): self.assertIn('version installed in tools directory: ' + RISCV_ESP_GDB_VERSION, output) output = self.run_idf_tools_with_action(['export']) - self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' % + self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' % (self.temp_tools_dir, ESP32ULP_VERSION), output) self.assertIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output) @@ -183,8 +175,6 @@ class TestUsage(unittest.TestCase): (self.temp_tools_dir, OPENOCD_VERSION), output) self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' % (self.temp_tools_dir, RISCV_ELF_VERSION), output) - self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32S2ULP_VERSION), output) self.assertIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output) self.assertIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' % @@ -199,12 +189,11 @@ class TestUsage(unittest.TestCase): output = self.run_idf_tools_with_action(['install', '--targets=esp32']) self.assert_tool_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION) self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION) - self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE) + self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION) self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION) self.assert_tool_not_installed(output, RISCV_ELF, RISCV_ELF_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION) - self.assert_tool_not_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE) self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION) self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output) self.assertEqual(required_tools_installed, output.count('Done')) @@ -216,7 +205,7 @@ class TestUsage(unittest.TestCase): self.assertIn('version installed in tools directory: ' + XTENSA_ESP_GDB_VERSION, output) output = self.run_idf_tools_with_action(['export']) - self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' % + self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' % (self.temp_tools_dir, ESP32ULP_VERSION), output) self.assertIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output) @@ -226,8 +215,6 @@ class TestUsage(unittest.TestCase): (self.temp_tools_dir, XTENSA_ESP_GDB_VERSION), output) self.assertNotIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' % (self.temp_tools_dir, RISCV_ELF_VERSION), output) - self.assertNotIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32S2ULP_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' % @@ -244,8 +231,7 @@ class TestUsage(unittest.TestCase): self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION) - self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE) - self.assert_tool_not_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE) + self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP_GDB_VERSION, XTENSA_ESP_GDB_VERSION) self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output) self.assertEqual(required_tools_installed, output.count('Done')) @@ -260,12 +246,10 @@ class TestUsage(unittest.TestCase): (self.temp_tools_dir, OPENOCD_VERSION), output) self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' % (self.temp_tools_dir, RISCV_ELF_VERSION), output) - self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' % + self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' % (self.temp_tools_dir, ESP32ULP_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output) - self.assertNotIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32S2ULP_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' % @@ -279,30 +263,26 @@ class TestUsage(unittest.TestCase): self.assert_tool_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION) self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION) self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION) + self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION) self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION) self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION) - self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE) - self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE) self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output) self.assertEqual(required_tools_installed, output.count('Done')) output = self.run_idf_tools_with_action(['check']) - self.assertIn('version installed in tools directory: ' + ESP32S2ULP_VERSION, output) self.assertIn('version installed in tools directory: ' + OPENOCD_VERSION, output) self.assertIn('version installed in tools directory: ' + XTENSA_ESP32S2_ELF_VERSION, output) self.assertIn('version installed in tools directory: ' + XTENSA_ESP_GDB_VERSION, output) output = self.run_idf_tools_with_action(['export']) - self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32S2ULP_VERSION), output) self.assertIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output) self.assertIn('%s/tools/openocd-esp32/%s/openocd-esp32/bin' % (self.temp_tools_dir, OPENOCD_VERSION), output) - self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32ULP_VERSION), output) + self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' % + (self.temp_tools_dir, ESP32ULP_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output) self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' % @@ -320,12 +300,11 @@ class TestUsage(unittest.TestCase): self.assert_tool_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION) self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION) self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION) + self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION) self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION) self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION) self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION) - self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE) - self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE) self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output) self.assertEqual(required_tools_installed, output.count('Done')) @@ -340,14 +319,12 @@ class TestUsage(unittest.TestCase): (self.temp_tools_dir, OPENOCD_VERSION), output) self.assertIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32S3_ELF_VERSION), output) - self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32ULP_VERSION), output) + self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' % + (self.temp_tools_dir, ESP32ULP_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output) self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' % (self.temp_tools_dir, RISCV_ELF_VERSION), output) - self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' % - (self.temp_tools_dir, ESP32S2ULP_VERSION), output) self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' % (self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output) self.assertIn('%s/tools/xtensa-esp-elf-gdb/%s/xtensa-esp-elf-gdb/bin' % diff --git a/tools/tools.json b/tools/tools.json index 7fc16d8ddb..a0b9e09451 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -502,143 +502,68 @@ "description": "Toolchain for ESP32 ULP coprocessor", "export_paths": [ [ - "esp32ulp-elf-binutils", + "esp32ulp-elf", "bin" ] ], "export_vars": {}, - "info_url": "https://github.com/espressif/binutils-esp32ulp", + "info_url": "https://github.com/espressif/binutils-gdb", "install": "always", - "license": "GPL-2.0-or-later", + "license": "GPL-3.0-or-later", "name": "esp32ulp-elf", - "platform_overrides": [ - { - "install": "never", - "platforms": [ - "linux-i686", - "linux-arm64" - ] - } - ], "supported_targets": [ - "esp32" + "esp32", + "esp32s2", + "esp32s3" ], "version_cmd": [ "esp32ulp-elf-as", "--version" ], - "version_regex": "\\(GNU Binutils\\)\\s+([0-9a-z\\.\\-]+)", + "version_regex": "\\(GNU Binutils\\)\\s+([a-z0-9.-_]+)", "versions": [ { "linux-amd64": { - "sha256": "3016c4fc551181175bd9979869bc1d1f28fa8efa25a0e29ad7f833fca4bc03d7", - "size": 8248656, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz" + "sha256": "b1f7801c3a16162e72393ebb772c0cbfe4d22d907be7c2c2dac168736e9195fd", + "size": 10685282, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-linux-amd64.tar.gz" + }, + "linux-arm64": { + "sha256": "d6671b31bab31b9b13aea25bb7d60f15484cb8bf961ddbf67a62867e5563eae5", + "size": 10052225, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-linux-arm64.tar.gz" }, "linux-armel": { - "sha256": "88967c086a6e71834282d9ae05841ee74dae1815f27807b25cdd3f7775a47101", - "size": 8033639, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-armel-2.28.51-esp-20191205.tar.gz" + "sha256": "e107e7a9cd50d630b034f435a16a52db5a57388dc639a99c4c393c5e429711e9", + "size": 10087257, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-linux-armel.tar.gz" }, "linux-armhf": { - "sha256": "88967c086a6e71834282d9ae05841ee74dae1815f27807b25cdd3f7775a47101", - "size": 8033639, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-armel-2.28.51-esp-20191205.tar.gz" + "sha256": "6c6dd25477b2e758d4669da3774bf664d1f012442c880f17dfdf0339e9c3dae9", + "size": 9591791, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-linux-armhf.tar.gz" }, "macos": { - "sha256": "a35d9e7a0445247c7fc9dccd3fbc35682f0fafc28beeb10c94b59466317190c4", - "size": 8872874, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-macos-2.28.51-esp-20191205.tar.gz" + "sha256": "5a952087b621ced16af1e375feac1371a61cb51ab7e7b44cbefb5afda2d573de", + "size": 16028909, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-macos.tar.gz" }, "macos-arm64": { - "sha256": "a35d9e7a0445247c7fc9dccd3fbc35682f0fafc28beeb10c94b59466317190c4", - "size": 8872874, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-macos-2.28.51-esp-20191205.tar.gz" + "sha256": "73bda8476ef92d4f4abee96519abbba40e5ee32f368427469447b83cc7bb9b42", + "size": 15045401, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-macos-arm64.tar.gz" }, - "name": "2.28.51-esp-20191205", + "name": "2.35_20220830", "status": "recommended", "win32": { - "sha256": "bade309353a9f0a4e5cc03bfe84845e33205f05502c4b199195e871ded271ab5", - "size": 12234162, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-win32-2.28.51-esp-20191205.zip" + "sha256": "77344715ea7d7a7a9fd0b27653f880efaf3bcc1ac843f61492d8a0365d91f731", + "size": 14651337, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-win32.zip" }, "win64": { - "sha256": "bade309353a9f0a4e5cc03bfe84845e33205f05502c4b199195e871ded271ab5", - "size": 12234162, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-win32-2.28.51-esp-20191205.zip" - } - } - ] - }, - { - "description": "Toolchain for ESP32-S2 and ESP32-S3 ULP coprocessors", - "export_paths": [ - [ - "esp32s2ulp-elf-binutils", - "bin" - ] - ], - "export_vars": {}, - "info_url": "https://github.com/espressif/binutils-esp32ulp", - "install": "always", - "license": "GPL-2.0-or-later", - "name": "esp32s2ulp-elf", - "platform_overrides": [ - { - "install": "never", - "platforms": [ - "linux-i686", - "linux-arm64" - ] - } - ], - "supported_targets": [ - "esp32s2", - "esp32s3" - ], - "version_cmd": [ - "esp32s2ulp-elf-as", - "--version" - ], - "version_regex": "\\(GNU Binutils\\)\\s+([0-9a-z\\.\\-]+)", - "versions": [ - { - "linux-amd64": { - "sha256": "df7b2ff6c7c718a7cbe3b4b6dbcd68180d835d164d1913bc4698fd3781b9a466", - "size": 8254018, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-linux-amd64-2.28.51-esp-20191205.tar.gz" - }, - "linux-armel": { - "sha256": "893b213c8f716d455a6efb2b08b6cf1bc34d08b78ee19c31e82ac44b1b45417e", - "size": 8034624, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-linux-armel-2.28.51-esp-20191205.tar.gz" - }, - "linux-armhf": { - "sha256": "893b213c8f716d455a6efb2b08b6cf1bc34d08b78ee19c31e82ac44b1b45417e", - "size": 8034624, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-linux-armel-2.28.51-esp-20191205.tar.gz" - }, - "macos": { - "sha256": "5a9bb678a5246638cbda303f523d9bb8121a9a24dc01ecb22c21c46c41184155", - "size": 8876194, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-macos-2.28.51-esp-20191205.tar.gz" - }, - "macos-arm64": { - "sha256": "5a9bb678a5246638cbda303f523d9bb8121a9a24dc01ecb22c21c46c41184155", - "size": 8876194, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-macos-2.28.51-esp-20191205.tar.gz" - }, - "name": "2.28.51-esp-20191205", - "status": "recommended", - "win32": { - "sha256": "587de59fbb469a39f96168ae3eaa9f06b2601e6e0543c87eaf1bd97f23e5c4ca", - "size": 12239199, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-win32-2.28.51-esp-20191205.zip" - }, - "win64": { - "sha256": "587de59fbb469a39f96168ae3eaa9f06b2601e6e0543c87eaf1bd97f23e5c4ca", - "size": 12239199, - "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-win32-2.28.51-esp-20191205.zip" + "sha256": "525e5b4c8299869a3fdddb51baad76612c5c104bd96952ae6460ad7e5b5a4e21", + "size": 15399090, + "url": "https://github.com/espressif/binutils-gdb/releases/download/esp32ulp-elf-v2.35_20220830/esp32ulp-elf-2.35_20220830-win64.zip" } } ]