8000 tools: update esp32ulp-elf to v2.35_20220830 · espressif/esp-idf@a9bd454 · GitHub
[go: up one dir, main page]
Skip to content

Commit a9bd454

Browse files
LapshinLapshin
committed
tools: update esp32ulp-elf to v2.35_20220830
Closes #6432 Closes espressif/binutils-esp32ulp#23
1 parent f684ab6 commit a9bd454

File tree

10 files changed

+62
-173
lines changed

10 files changed

+62
-173
lines changed

‎components/ulp/cmake/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ add_executable(${ULP_APP_NAME})
66

77
option(ULP_COCPU_IS_RISCV "Use RISC-V based ULP" OFF)
88

9-
set(version_pattern "[a-z0-9\.-]+")
9+
set(version_pattern "[a-z0-9\.-_]+")
1010

1111
# Check assembler version
1212
execute_process(
@@ -23,7 +23,7 @@ message(STATUS "Building ULP app ${ULP_APP_NAME}")
2323
# Check the supported assembler version
2424
if(NOT ULP_COCPU_IS_RISCV)
2525
message(STATUS "ULP assembler version: ${as_version}")
26-
set(as_supported_version 2.28.51-esp-20191205)
26+
set(as_supported_version 2.35_20220830)
2727

2828
if(NOT as_version STREQUAL as_supported_version)
2929
message(WARNING "WARNING: ULP assembler version ${as_version} is not supported. Expected to see version: \

‎components/ulp/cmake/toolchain-esp32-ulp.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
# CMake toolchain file for ULP
2-
32
set(CMAKE_SYSTEM_NAME Generic)
43

54
# Compiler is only used for preprocessing
65
set(CMAKE_C_COMPILER "xtensa-esp32-elf-gcc")
6+
set(CMAKE_CXX_COMPILER "xtensa-esp32-elf-g++")
77

88
set(CMAKE_ASM_COMPILER "esp32ulp-elf-as")
99
set(CMAKE_LINKER "esp32ulp-elf-ld")
1010

11-
if(NOT ASM_DIALECT)
12-
set(ASM_DIALECT "")
13-
endif()
1411

1512
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \
16-
<DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
13+
--mcpu=esp32 <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
1714
set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32ulp -nostdlib" CACHE STRING "ULP Linker Base Flags")
1815
set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} <FLAGS> <CMAKE_ASM_LINK_FLAGS> \
1916
<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

‎components/ulp/cmake/toolchain-esp32s2-ulp.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# CMake toolchain file for ULP
2-
32
set(CMAKE_SYSTEM_NAME Generic)
43

54
# Compiler is only used for preprocessing
65
set(CMAKE_C_COMPILER "xtensa-esp32s2-elf-gcc")
6+
set(CMAKE_CXX_COMPILER "xtensa-esp32s2-elf-g++")
77

8-
set(CMAKE_ASM_COMPILER "esp32s2ulp-elf-as")
9-
set(CMAKE_LINKER "esp32s2ulp-elf-ld")
8+
set(CMAKE_ASM_COMPILER "esp32ulp-elf-as")
9+
set(CMAKE_LINKER "esp32ulp-elf-ld")
1010

1111
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \
12-
<DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
12+
--mcpu=esp32s2 <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
1313
set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32s2ulp -nostdlib" CACHE STRING "ULP Linker Base Flags")
1414
set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} <FLAGS> <CMAKE_ASM_LINK_FLAGS> \
1515
<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

‎components/ulp/cmake/toolchain-esp32s3-ulp.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# CMake toolchain file for ULP
2-
32
set(CMAKE_SYSTEM_NAME Generic)
43

54
# Compiler is only used for preprocessing
6-
#TODO: Update toolchain to be used once esp32s3 support is added to binutils
7-
set(CMAKE_C_COMPILER "xtensa-esp32s2-elf-gcc")
5+
set(CMAKE_C_COMPILER "xtensa-esp32s3-elf-gcc")
6+
set(CMAKE_CXX_COMPILER "xtensa-esp32s3-elf-g++")
87

9-
set(CMAKE_ASM_COMPILER "esp32s2ulp-elf-as")
10-
set(CMAKE_LINKER "esp32s2ulp-elf-ld")
8+
set(CMAKE_ASM_COMPILER "esp32ulp-elf-as")
9+
set(CMAKE_LINKER "esp32ulp-elf-ld")
1110

11+
# Use ESP32-S2 ULP tools here, because ESP32-S3 uses the same ULP coprocessor type
1212
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "${CMAKE_ASM${ASM_DIALECT}_COMPILER} \
13-
<DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
13+
--mcpu=esp32s2 <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
1414
set(CMAKE_EXE_LINKER_FLAGS "-A elf32-esp32s2ulp -nostdlib" CACHE STRING "ULP Linker Base Flags")
1515
set(CMAKE_ASM_LINK_EXECUTABLE "${CMAKE_LINKER} <FLAGS> <CMAKE_ASM_LINK_FLAGS> \
1616
<LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

‎docs/en/api-guides/tools/idf-tools-notes.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
.. tool-esp32ulp-elf-notes
3636

3737

38-
---
39-
40-
.. tool-esp32s2ulp-elf-notes
41-
42-
4338
---
4439

4540
.. tool-openocd-esp32-notes

‎docs/en/api-reference/system/ulp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ API Reference
184184
.. include-build-file:: inc/ulp_common.inc
185185
.. include-build-file:: inc/ulp_common_defs.inc
186186

187-
.. _binutils-esp32ulp toolchain: https://github.com/espressif/binutils-esp32ulp
187+
.. _binutils-esp32ulp toolchain: https://github.com/espressif/binutils-gdb

‎docs/zh_CN/api-guides/tools/idf-tools-notes.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
.. tool-esp32ulp-elf-notes
3838

3939

40-
---
41-
42-
.. tool-esp32s2ulp-elf-notes
43-
44-
4540
---
4641

4742
.. tool-openocd-esp32-notes

‎docs/zh_CN/api-reference/system/ulp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ API 参考
184184
.. include-build-file:: inc/ulp_common.inc
185185
.. include-build-file:: inc/ulp_common_defs.inc
186186

187-
.. _binutils-esp32ulp 工具链: https://github.com/espressif/binutils-esp32ulp
187+
.. _binutils-esp32ulp 工具链: https://github.com/espressif/binutils-gdb

‎tools/test_idf_tools/test_idf_tools.py

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ def redirect_stdout(target):
3838
import idf_tools
3939

4040
ESP32ULP = 'esp32ulp-elf'
41-
ESP32ULP_ARCHIVE = 'binutils-esp32ulp'
42-
ESP32S2ULP = 'esp32s2ulp-elf'
43-
ESP32S2ULP_ARCHIVE = 'binutils-esp32s2ulp'
4441
OPENOCD = 'openocd-esp32'
4542
RISCV_ELF = 'riscv32-esp-elf'
4643
XTENSA_ESP32_ELF = 'xtensa-esp32-elf'
@@ -66,7 +63,6 @@ def get_version_dict():
6663
version_dict = get_version_dict()
6764

6865
ESP32ULP_VERSION = version_dict[ESP32ULP]
69-
ESP32S2ULP_VERSION = version_dict[ESP32S2ULP]
7066
OPENOCD_VERSION = version_dict[OPENOCD]
7167
RISCV_ELF_VERSION = version_dict[RISCV_ELF]
7268
XTENSA_ESP32_ELF_VERSION = version_dict[XTENSA_ESP32_ELF]
@@ -136,8 +132,6 @@ def test_usage_basic(self):
136132
output = self.run_idf_tools_with_action(['list'])
137133
self.assertIn('* %s:' % ESP32ULP, output)
138134
self.assertIn('- %s (recommended)' % ESP32ULP_VERSION, output)
139-
self.assertIn('* %s:' % ESP32S2ULP, output)
140-
self.assertIn('- %s (recommended)' % 10000 ESP32S2ULP_VERSION, output)
141135
self.assertIn('* %s:' % OPENOCD, output)
142136
self.assertIn('- %s (recommended)' % OPENOCD_VERSION, output)
143137
self.assertIn('* %s:' % RISCV_ELF, output)
@@ -149,23 +143,21 @@ def test_usage_basic(self):
149143
self.assertIn('* %s:' % XTENSA_ESP32S3_ELF, output)
150144
self.assertIn('- %s (recommended)' % XTENSA_ESP32S3_ELF_VERSION, output)
151145

152-
required_tools_installed = 9
146+
required_tools_installed = 8
153147
output = self.run_idf_tools_with_action(['install'])
154148
self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
155149
self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
156150
self.assert_tool_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
157151
self.assert_tool_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
158152
self.assert_tool_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
159-
self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
160-
self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
153+
self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
161154
self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
162155
self.assert_tool_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
163156
self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
164157
self.assertEqual(required_tools_installed, output.count('Done'))
165158

166159
output = self.run_idf_tools_with_action(['check'])
167160
self.assertIn('version installed in tools directory: ' + ESP32ULP_VERSION, output)
168-
self.assertIn('version installed in tools directory: ' + ESP32S2ULP_VERSION, output)
169161
self.assertIn('version installed in tools directory: ' + OPENOCD_VERSION, output)
170162
self.assertIn('version installed in tools directory: ' + RISCV_ELF_VERSION, output)
171163
self.assertIn('version installed in tools directory: ' + XTENSA_ESP32_ELF_VERSION, output)
@@ -175,16 +167,14 @@ def test_usage_basic(self):
175167
self.assertIn('version installed in tools directory: ' + RISCV_ESP_GDB_VERSION, output)
176168

177169
output = self.run_idf_tools_with_action(['export'])
178-
self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
170+
self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
179171
(self.temp_tools_dir, ESP32ULP_VERSION), output)
180172
self.assertIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
181173
(self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
182174
self.assertIn('%s/tools/openocd-esp32/%s/openocd-esp32/bin' %
183175
(self.temp_tools_dir, OPENOCD_VERSION), output)
184176
self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
185177
(self.temp_tools_dir, RISCV_ELF_VERSION), output)
186-
self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
187-
(self.temp_tools_dir, ESP32S2ULP_VERSION), output)
188178
self.assertIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
189179
(self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
190180
self.assertIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
@@ -199,12 +189,11 @@ def test_tools_for_esp32(self):
199189
output = self.run_idf_tools_with_action(['install', '--targets=esp32'])
200190
self.assert_tool_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
201191
self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
202-
self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
192+
self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
203193
self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
204194
self.assert_tool_not_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
205195
self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
206196
self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
207-
self.assert_tool_not_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
208197
self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
209198
self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
210199
self.assertEqual(required_tools_installed, output.count('Done'))
@@ -216,7 +205,7 @@ def test_tools_for_esp32(self):
216205
self.assertIn('version installed in tools directory: ' + XTENSA_ESP_GDB_VERSION, output)
217206

218207
output = self.run_idf_tools_with_action(['export'])
219-
self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
208+
self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
220209
(self.temp_tools_dir, ESP32ULP_VERSION), output)
221210
self.assertIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
222211
(self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
@@ -226,8 +215,6 @@ def test_tools_for_esp32(self):
226215
(self.temp_tools_dir, XTENSA_ESP_GDB_VERSION), output)
227216
self.assertNotIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
228217
(self.temp_tools_dir, RISCV_ELF_VERSION), output)
229-
self.assertNotIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
230-
(self.temp_tools_dir, ESP32S2ULP_VERSION), output)
231218
self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
232219
(self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
233220
self.assertNotIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
@@ -244,8 +231,7 @@ def test_tools_for_esp32c3(self):
244231
self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
245232
self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
246233
self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
247-
self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
248-
self.assert_tool_not_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
234+
self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION)
249235
self.assert_tool_not_installed(output, XTENSA_ESP_GDB_VERSION, XTENSA_ESP_GDB_VERSION)
250236
self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
251237
self.assertEqual(required_tools_installed, output.count('Done'))
@@ -260,12 +246,10 @@ def test_tools_for_esp32c3(self):
260246
(self.temp_tools_dir, OPENOCD_VERSION), output)
261247
self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
262248
(self.temp_tools_dir, RISCV_ELF_VERSION), output)
263-
self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
249+
self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
264250
(self.temp_tools_dir, ESP32ULP_VERSION), output)
265251
self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
266252
(self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
267-
self.assertNotIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
268-
(self.temp_tools_dir, ESP32S2ULP_VERSION), output)
269253
self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
270254
(self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
271255
self.assertNotIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
@@ -279,30 +263,26 @@ def test_tools_for_esp32s2(self):
279263
self.assert_tool_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
280264
self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
281265
self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
266+
self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
282267
self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
283268
self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
284269
self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
285270
self.assert_tool_not_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
286-
self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
287-
self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
288271
self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
289272
self.assertEqual(required_tools_installed, output.count('Done'))
290273

291274
output = self.run_idf_tools_with_action(['check'])
292-
self.assertIn('version installed in tools directory: ' + ESP32S2ULP_VERSION, output)
293275
self.assertIn('version installed in tools directory: ' + OPENOCD_VERSION, output)
294276
self.assertIn('version installed in tools directory: ' + XTENSA_ESP32S2_ELF_VERSION, output)
295277
self.assertIn('version installed in tools directory: ' + XTENSA_ESP_GDB_VERSION, output)
296278

297279
output = self.run_idf_tools_with_action(['export'])
298-
self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
299-
(self.temp_tools_dir, ESP32S2ULP_VERSION), output)
300280
self.assertIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
301281
(self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
302282
self.assertIn('%s/tools/openocd-esp32/%s/openocd-esp32/bin' %
303283
(self.temp_tools_dir, OPENOCD_VERSION), output)
304-
self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
305-
(self.temp_tools_dir, ESP32ULP_VERSION), output)
284+
self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
285+
(self.temp_tools_dir, ESP32ULP_VERSION), output)
306286
self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
307287
(self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
308288
self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
@@ -320,12 +300,11 @@ def test_tools_for_esp32s3(self):
320300
self.assert_tool_installed(output, XTENSA_ESP32S3_ELF, XTENSA_ESP32S3_ELF_VERSION)
321301
self.assert_tool_installed(output, OPENOCD, OPENOCD_VERSION)
322302
self.assert_tool_installed(output, RISCV_ELF, RISCV_ELF_VERSION)
303+
self.assert_tool_installed(output, ESP32ULP, ESP32ULP_VERSION)
323304
self.assert_tool_installed(output, XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION)
324305
self.assert_tool_not_installed(output, RISCV_ESP_GDB, RISCV_ESP_GDB_VERSION)
325306
self.assert_tool_not_installed(output, XTENSA_ESP32_ELF, XTENSA_ESP32_ELF_VERSION)
326307
self.assert_tool_not_installed(output, XTENSA_ESP32S2_ELF, XTENSA_ESP32S2_ELF_VERSION)
327-
self.assert_tool_not_installed(output, ESP32ULP, ESP32ULP_VERSION, ESP32ULP_ARCHIVE)
328-
self.assert_tool_installed(output, ESP32S2ULP, ESP32S2ULP_VERSION, ESP32S2ULP_ARCHIVE)
329308
self.assertIn('Destination: {}'.format(os.path.join(self.temp_tools_dir, 'dist')), output)
330309
self.assertEqual(required_tools_installed, output.count('Done'))
331310

@@ -340,14 +319,12 @@ def test_tools_for_esp32s3(self):
340319
(self.temp_tools_dir, OPENOCD_VERSION), output)
341320
self.assertIn('%s/tools/xtensa-esp32s3-elf/%s/xtensa-esp32s3-elf/bin' %
342321
(self.temp_tools_dir, XTENSA_ESP32S3_ELF_VERSION), output)
343-
self.assertNotIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf-binutils/bin' %
344-
(self.temp_tools_dir, ESP32ULP_VERSION), output)
322+
self.assertIn('%s/tools/esp32ulp-elf/%s/esp32ulp-elf/bin' %
323+
(self.temp_tools_dir, ESP32ULP_VERSION), output)
345324
self.assertNotIn('%s/tools/xtensa-esp32-elf/%s/xtensa-esp32-elf/bin' %
346325
(self.temp_tools_dir, XTENSA_ESP32_ELF_VERSION), output)
347326
self.assertIn('%s/tools/riscv32-esp-elf/%s/riscv32-esp-elf/bin' %
348327
(self.temp_tools_dir, RISCV_ELF_VERSION), output)
349-
self.assertIn('%s/tools/esp32s2ulp-elf/%s/esp32s2ulp-elf-binutils/bin' %
350-
(self.temp_tools_dir, ESP32S2ULP_VERSION), output)
351328
self.assertNotIn('%s/tools/xtensa-esp32s2-elf/%s/xtensa-esp32s2-elf/bin' %
352329
(self.temp_tools_dir, XTENSA_ESP32S2_ELF_VERSION), output)
353330
self.assertIn('%s/tools/xtensa-esp-elf-gdb/%s/xtensa-esp-elf-gdb/bin' %

0 commit comments

Comments
 (0)
0