Skip to content

Commit c700845

Browse files
committed
Fix bootloop issue and enable DSP optimization
1 parent 9346d97 commit c700845

File tree

6 files changed

+147
-148
lines changed

6 files changed

+147
-148
lines changed

boards.txt

+141-141
Original file line numberDiff line numberDiff line change
@@ -20,147 +20,6 @@ menu.EventsCore=Events Run On
2020
### DO NOT PUT BOARDS ABOVE THE OFFICIAL ESPRESSIF BOARDS! ###
2121
##############################################################
2222

23-
esp32c3.name=ESP32C3 Dev Module
24-
esp32c3.vid.0=0x303a
25-
esp32c3.pid.0=0x1001
26-
27-
esp32c3.upload.tool=esptool_py
28-
esp32c3.upload.maximum_size=1310720
29-
esp32c3.upload.maximum_data_size=327680
30-
esp32c3.upload.flags=
31-
esp32c3.upload.extra_flags=
32-
esp32c3.upload.use_1200bps_touch=false
33-
esp32c3.upload.wait_for_upload_port=false
34-
35-
esp32c3.serial.disableDTR=false
36-
esp32c3.serial.disableRTS=false
37-
38-
esp32c3.build.tarch=riscv32
39-
esp32c3.build.target=esp
40-
esp32c3.build.mcu=esp32c3
41-
esp32c3.build.core=esp32
42-
esp32c3.build.variant=esp32c3
43-
esp32c3.build.board=ESP32C3_DEV
44-
esp32c3.build.bootloader_addr=0x0
45-
46-
esp32c3.build.cdc_on_boot=0
47-
esp32c3.build.f_cpu=160000000L
48-
esp32c3.build.flash_size=4MB
49-
esp32c3.build.flash_freq=80m
50-
esp32c3.build.flash_mode=qio
51-
esp32c3.build.boot=qio
52-
esp32c3.build.partitions=default
53-
esp32c3.build.defines=
54-
55-
esp32c3.menu.CDCOnBoot.default=Disabled
56-
esp32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
57-
esp32c3.menu.CDCOnBoot.cdc=Enabled
58-
esp32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
59-
60-
esp32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
61-
esp32c3.menu.PartitionScheme.default.build.partitions=default
62-
esp32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
63-
esp32c3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
64-
esp32c3.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
65-
esp32c3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
66-
esp32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
67-
esp32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
68-
esp32c3.menu.PartitionScheme.minimal.build.partitions=minimal
69-
esp32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
70-
esp32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
71-
esp32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
72-
esp32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
73-
esp32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
74-
esp32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
75-
esp32c3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
76-
esp32c3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
77-
esp32c3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
78-
esp32c3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
79-
esp32c3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
80-
esp32c3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
81-
esp32c3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
82-
esp32c3.menu.PartitionScheme.huge_app.build.partitions=huge_app
83-
esp32c3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
84-
esp32c3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
85-
esp32c3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
86-
esp32c3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
87-
esp32c3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
88-
esp32c3.menu.PartitionScheme.fatflash.build.partitions=ffat
89-
esp32c3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
90-
esp32c3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
91-
esp32c3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
92-
esp32c3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
93-
94-
esp32c3.menu.CPUFreq.160=160MHz (WiFi)
95-
esp32c3.menu.CPUFreq.160.build.f_cpu=160000000L
96-
esp32c3.menu.CPUFreq.80=80MHz (WiFi)
97-
esp32c3.menu.CPUFreq.80.build.f_cpu=80000000L
98-
esp32c3.menu.CPUFreq.40=40MHz
99-
esp32c3.menu.CPUFreq.40.build.f_cpu=40000000L
100-
esp32c3.menu.CPUFreq.20=20MHz
101-
esp32c3.menu.CPUFreq.20.build.f_cpu=20000000L
102-
esp32c3.menu.CPUFreq.10=10MHz
103-
esp32c3.menu.CPUFreq.10.build.f_cpu=10000000L
104-
105-
esp32c3.menu.FlashMode.qio=QIO
106-
esp32c3.menu.FlashMode.qio.build.flash_mode=dio
107-
esp32c3.menu.FlashMode.qio.build.boot=qio
108-
esp32c3.menu.FlashMode.dio=DIO
109-
esp32c3.menu.FlashMode.dio.build.flash_mode=dio
110-
esp32c3.menu.FlashMode.dio.build.boot=dio
111-
esp32c3.menu.FlashMode.qout=QOUT
112-
esp32c3.menu.FlashMode.qout.build.flash_mode=dout
113-
esp32c3.menu.FlashMode.qout.build.boot=qout
114-
esp32c3.menu.FlashMode.dout=DOUT
115-
esp32c3.menu.FlashMode.dout.build.flash_mode=dout
116-
esp32c3.menu.FlashMode.dout.build.boot=dout
117-
118-
esp32c3.menu.FlashFreq.80=80MHz
119-
esp32c3.menu.FlashFreq.80.build.flash_freq=80m
120-
esp32c3.menu.FlashFreq.40=40MHz
121-
esp32c3.menu.FlashFreq.40.build.flash_freq=40m
122-
123-
esp32c3.menu.FlashSize.4M=4MB (32Mb)
124-
esp32c3.menu.FlashSize.4M.build.flash_size=4MB
125-
esp32c3.menu.FlashSize.8M=8MB (64Mb)
126-
esp32c3.menu.FlashSize.8M.build.flash_size=8MB
127-
esp32c3.menu.FlashSize.8M.build.partitions=default_8MB
128-
esp32c3.menu.FlashSize.2M=2MB (16Mb)
129-
esp32c3.menu.FlashSize.2M.build.flash_size=2MB
130-
esp32c3.menu.FlashSize.2M.build.partitions=minimal
131-
esp32c3.menu.FlashSize.16M=16MB (128Mb)
132-
esp32c3.menu.FlashSize.16M.build.flash_size=16MB
133-
134-
esp32c3.menu.UploadSpeed.921600=921600
135-
esp32c3.menu.UploadSpeed.921600.upload.speed=921600
136-
esp32c3.menu.UploadSpeed.115200=115200
137-
esp32c3.menu.UploadSpeed.115200.upload.speed=115200
138-
esp32c3.menu.UploadSpeed.256000.windows=256000
139-
esp32c3.menu.UploadSpeed.256000.upload.speed=256000
140-
esp32c3.menu.UploadSpeed.230400.windows.upload.speed=256000
141-
esp32c3.menu.UploadSpeed.230400=230400
142-
esp32c3.menu.UploadSpeed.230400.upload.speed=230400
143-
esp32c3.menu.UploadSpeed.460800.linux=460800
144-
esp32c3.menu.UploadSpeed.460800.macosx=460800
145-
esp32c3.menu.UploadSpeed.460800.upload.speed=460800
146-
esp32c3.menu.UploadSpeed.512000.windows=512000
147-
esp32c3.menu.UploadSpeed.512000.upload.speed=512000
148-
149-
esp32c3.menu.DebugLevel.none=None
150-
esp32c3.menu.DebugLevel.none.build.code_debug=0
151-
esp32c3.menu.DebugLevel.error=Error
152-
esp32c3.menu.DebugLevel.error.build.code_debug=1
153-
esp32c3.menu.DebugLevel.warn=Warn
154-
esp32c3.menu.DebugLevel.warn.build.code_debug=2
155-
esp32c3.menu.DebugLevel.info=Info
156-
esp32c3.menu.DebugLevel.info.build.code_debug=3
157-
esp32c3.menu.DebugLevel.debug=Debug
158-
esp32c3.menu.DebugLevel.debug.build.code_debug=4
159-
esp32c3.menu.DebugLevel.verbose=Verbose
160-
esp32c3.menu.DebugLevel.verbose.build.code_debug=5
161-
162-
##############################################################
163-
16423
esp32s3.name=ESP32S3 Dev Module
16524
esp32s3.vid.0=0x303a
16625
esp32s3.pid.0=0x1001
@@ -340,6 +199,147 @@ esp32s3.menu.DebugLevel.verbose.build.code_debug=5
340199

341200
##############################################################
342201

202+
esp32c3.name=ESP32C3 Dev Module
203+
esp32c3.vid.0=0x303a
204+
esp32c3.pid.0=0x1001
205+
206+
esp32c3.upload.tool=esptool_py
207+
esp32c3.upload.maximum_size=1310720
208+
esp32c3.upload.maximum_data_size=327680
209+
esp32c3.upload.flags=
210+
esp32c3.upload.extra_flags=
211+
esp32c3.upload.use_1200bps_touch=false
212+
esp32c3.upload.wait_for_upload_port=false
213+
214+
esp32c3.serial.disableDTR=false
215+
esp32c3.serial.disableRTS=false
216+
217+
esp32c3.build.tarch=riscv32
218+
esp32c3.build.target=esp
219+
esp32c3.build.mcu=esp32c3
220+
esp32c3.build.core=esp32
221+
esp32c3.build.variant=esp32c3
222+
esp32c3.build.board=ESP32C3_DEV
223+
esp32c3.build.bootloader_addr=0x0
224+
225+
esp32c3.build.cdc_on_boot=0
226+
esp32c3.build.f_cpu=160000000L
227+
esp32c3.build.flash_size=4MB
228+
esp32c3.build.flash_freq=80m
229+
esp32c3.build.flash_mode=qio
230+
esp32c3.build.boot=qio
231+
esp32c3.build.partitions=default
232+
esp32c3.build.defines=
233+
234+
esp32c3.menu.CDCOnBoot.default=Disabled
235+
esp32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
236+
esp32c3.menu.CDCOnBoot.cdc=Enabled
237+
esp32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
238+
239+
esp32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
240+
esp32c3.menu.PartitionScheme.default.build.partitions=default
241+
esp32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
242+
esp32c3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
243+
esp32c3.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
244+
esp32c3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
245+
esp32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
246+
esp32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
247+
esp32c3.menu.PartitionScheme.minimal.build.partitions=minimal
248+
esp32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
249+
esp32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
250+
esp32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
251+
esp32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
252+
esp32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
253+
esp32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
254+
esp32c3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
255+
esp32c3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
256+
esp32c3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
257+
esp32c3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
258+
esp32c3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
259+
esp32c3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
260+
esp32c3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
261+
esp32c3.menu.PartitionScheme.huge_app.build.partitions=huge_app
262+
esp32c3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
263+
esp32c3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
264+
esp32c3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
265+
esp32c3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
266+
esp32c3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
267+
esp32c3.menu.PartitionScheme.fatflash.build.partitions=ffat
268+
esp32c3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
269+
esp32c3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
270+
esp32c3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
271+
esp32c3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
272+
273+
esp32c3.menu.CPUFreq.160=160MHz (WiFi)
274+
esp32c3.menu.CPUFreq.160.build.f_cpu=160000000L
275+
esp32c3.menu.CPUFreq.80=80MHz (WiFi)
276+
esp32c3.menu.CPUFreq.80.build.f_cpu=80000000L
277+
esp32c3.menu.CPUFreq.40=40MHz
278+
esp32c3.menu.CPUFreq.40.build.f_cpu=40000000L
279+
esp32c3.menu.CPUFreq.20=20MHz
280+
esp32c3.menu.CPUFreq.20.build.f_cpu=20000000L
281+
esp32c3.menu.CPUFreq.10=10MHz
282+
esp32c3.menu.CPUFreq.10.build.f_cpu=10000000L
283+
284+
esp32c3.menu.FlashMode.qio=QIO
285+
esp32c3.menu.FlashMode.qio.build.flash_mode=dio
286+
esp32c3.menu.FlashMode.qio.build.boot=qio
287+
esp32c3.menu.FlashMode.dio=DIO
288+
esp32c3.menu.FlashMode.dio.build.flash_mode=dio
289+
esp32c3.menu.FlashMode.dio.build.boot=dio
290+
esp32c3.menu.FlashMode.qout=QOUT
291+
esp32c3.menu.FlashMode.qout.build.flash_mode=dout
292+
esp32c3.menu.FlashMode.qout.build.boot=qout
293+
esp32c3.menu.FlashMode.dout=DOUT
294+
esp32c3.menu.FlashMode.dout.build.flash_mode=dout
295+
esp32c3.menu.FlashMode.dout.build.boot=dout
296+
297+
esp32c3.menu.FlashFreq.80=80MHz
298+
esp32c3.menu.FlashFreq.80.build.flash_freq=80m
299+
esp32c3.menu.FlashFreq.40=40MHz
300+
esp32c3.menu.FlashFreq.40.build.flash_freq=40m
301+
302+
esp32c3.menu.FlashSize.4M=4MB (32Mb)
303+
esp32c3.menu.FlashSize.4M.build.flash_size=4MB
304+
esp32c3.menu.FlashSize.8M=8MB (64Mb)
305+
esp32c3.menu.FlashSize.8M.build.flash_size=8MB
306+
esp32c3.menu.FlashSize.8M.build.partitions=default_8MB
307+
esp32c3.menu.FlashSize.2M=2MB (16Mb)
308+
esp32c3.menu.FlashSize.2M.build.flash_size=2MB
309+
esp32c3.menu.FlashSize.2M.build.partitions=minimal
310+
esp32c3.menu.FlashSize.16M=16MB (128Mb)
311+
esp32c3.menu.FlashSize.16M.build.flash_size=16MB
312+
313+
esp32c3.menu.UploadSpeed.921600=921600
314+
esp32c3.menu.UploadSpeed.921600.upload.speed=921600
315+
esp32c3.menu.UploadSpeed.115200=115200
316+
esp32c3.menu.UploadSpeed.115200.upload.speed=115200
317+
esp32c3.menu.UploadSpeed.256000.windows=256000
318+
esp32c3.menu.UploadSpeed.256000.upload.speed=256000
319+
esp32c3.menu.UploadSpeed.230400.windows.upload.speed=256000
320+
esp32c3.menu.UploadSpeed.230400=230400
321+
esp32c3.menu.UploadSpeed.230400.upload.speed=230400
322+
esp32c3.menu.UploadSpeed.460800.linux=460800
323+
esp32c3.menu.UploadSpeed.460800.macosx=460800
324+
esp32c3.menu.UploadSpeed.460800.upload.speed=460800
325+
esp32c3.menu.UploadSpeed.512000.windows=512000
326+
esp32c3.menu.UploadSpeed.512000.upload.speed=512000
327+
328+
esp32c3.menu.DebugLevel.none=None
329+
esp32c3.menu.DebugLevel.none.build.code_debug=0
330+
esp32c3.menu.DebugLevel.error=Error
331+
esp32c3.menu.DebugLevel.error.build.code_debug=1
332+
esp32c3.menu.DebugLevel.warn=Warn
333+
esp32c3.menu.DebugLevel.warn.build.code_debug=2
334+
esp32c3.menu.DebugLevel.info=Info
335+
esp32c3.menu.DebugLevel.info.build.code_debug=3
336+
esp32c3.menu.DebugLevel.debug=Debug
337+
esp32c3.menu.DebugLevel.debug.build.code_debug=4
338+
esp32c3.menu.DebugLevel.verbose=Verbose
339+
esp32c3.menu.DebugLevel.verbose.build.code_debug=5
340+
341+
##############################################################
342+
343343
esp32s2.name=ESP32S2 Dev Module
344344
esp32s2.vid.0=0x303a
345345
esp32s2.pid.0=0x0002

tools/sdk/esp32s3/include/config/sdkconfig.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define CONFIG_BOOTLOADER_LOG_LEVEL 0
2222
#define CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V 1
2323
#define CONFIG_BOOTLOADER_WDT_ENABLE 1
24-
#define CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE 1
2524
#define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
2625
#define CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP 1
2726
#define CONFIG_BOOTLOADER_RESERVE_RTC_SIZE 0x10
@@ -602,8 +601,8 @@
602601
#define CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT 30
603602
#define CONFIG_WPA_MBEDTLS_CRYPTO 1
604603
#define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
605-
#define CONFIG_DSP_ANSI 1
606-
#define CONFIG_DSP_OPTIMIZATION 0
604+
#define CONFIG_DSP_OPTIMIZED 1
605+
#define CONFIG_DSP_OPTIMIZATION 1
607606
#define CONFIG_DSP_MAX_FFT_SIZE_4096 1
608607
#define CONFIG_DSP_MAX_FFT_SIZE 4096
609608
#define CONFIG_OV7670_SUPPORT 1

tools/sdk/esp32s3/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32s3/lib/libesp-dsp.a

140 Bytes
Binary file not shown.

tools/sdk/esp32s3/lib/libesp_system.a

1.12 KB
Binary file not shown.

tools/sdk/esp32s3/sdkconfig

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
5454
# CONFIG_BOOTLOADER_FACTORY_RESET is not set
5555
# CONFIG_BOOTLOADER_APP_TEST is not set
5656
CONFIG_BOOTLOADER_WDT_ENABLE=y
57-
CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=y
57+
# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
5858
CONFIG_BOOTLOADER_WDT_TIME_MS=9000
5959
# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
6060
CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
@@ -1783,9 +1783,9 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
17831783
# DSP Library
17841784
#
17851785
CONFIG_DSP_OPTIMIZATIONS_SUPPORTED=y
1786-
CONFIG_DSP_ANSI=y
1787-
# CONFIG_DSP_OPTIMIZED is not set
1788-
CONFIG_DSP_OPTIMIZATION=0
1786+
# CONFIG_DSP_ANSI is not set
1787+
CONFIG_DSP_OPTIMIZED=y
1788+
CONFIG_DSP_OPTIMIZATION=1
17891789
# CONFIG_DSP_MAX_FFT_SIZE_512 is not set
17901790
# CONFIG_DSP_MAX_FFT_SIZE_1024 is not set
17911791
# CONFIG_DSP_MAX_FFT_SIZE_2048 is not set

0 commit comments

Comments
 (0)