Skip to content

Commit ca7f6cc

Browse files
me-no-devme-no-dev
committed
Update IDF libs to 9314bf0
1 parent b34d18f commit ca7f6cc

File tree

171 files changed

+3100
-10268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+3100
-10268
lines changed

‎boards.txt

+47-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
menu.UploadSpeed=Upload Speed
22
menu.FlashFreq=Flash Frequency
3+
menu.FlashMode=Flash Mode
34
menu.DebugLevel=Core Debug Level
45

56
##############################################################
@@ -20,8 +21,19 @@ esp32.build.variant=esp32
2021
esp32.build.board=ESP32_DEV
2122

2223
esp32.build.f_cpu=240000000L
23-
esp32.build.flash_mode=dio
2424
esp32.build.flash_size=4MB
25+
esp32.build.boot=bootloader
26+
27+
esp32.menu.FlashMode.qio=QIO
28+
esp32.menu.FlashMode.qio.build.flash_mode=dio
29+
esp32.menu.FlashMode.qio.build.boot=bootloader_qio
30+
esp32.menu.FlashMode.dio=DIO
31+
esp32.menu.FlashMode.dio.build.flash_mode=dio
32+
esp32.menu.FlashMode.qout=QOUT
33+
esp32.menu.FlashMode.qout.build.flash_mode=dout
34+
esp32.menu.FlashMode.qout.build.boot=bootloader_qio
35+
esp32.menu.FlashMode.dout=DOUT
36+
esp32.menu.FlashMode.dout.build.flash_mode=dout
2537

2638
esp32.menu.FlashFreq.80=80MHz
2739
esp32.menu.FlashFreq.80.build.flash_freq=80m
@@ -76,6 +88,7 @@ esp32thing.build.board=ESP32_THING
7688
esp32thing.build.f_cpu=240000000L
7789
esp32thing.build.flash_mode=dio
7890
esp32thing.build.flash_size=4MB
91+
esp32thing.build.boot=bootloader
7992

8093
esp32thing.menu.FlashFreq.80=80MHz
8194
esp32thing.menu.FlashFreq.80.build.flash_freq=80m
@@ -117,6 +130,7 @@ widora-air.build.board=WIDORA_AIR
117130
widora-air.build.f_cpu=240000000L
118131
widora-air.build.flash_mode=dio
119132
widora-air.build.flash_size=16MB
133+
widora-air.build.boot=bootloader
120134

121135
widora-air.menu.FlashFreq.80=80MHz
122136
widora-air.menu.FlashFreq.80.build.flash_freq=80m
@@ -158,6 +172,7 @@ esp320.build.board=ESP320
158172
esp320.build.f_cpu=240000000L
159173
esp320.build.flash_mode=qio
160174
esp320.build.flash_size=4MB
175+
esp320.build.boot=bootloader
161176

162177
esp320.menu.FlashFreq.80=80MHz
163178
esp320.menu.FlashFreq.80.build.flash_freq=80m
@@ -199,6 +214,7 @@ nano32.build.board=NANO32
199214
nano32.build.f_cpu=240000000L
200215
nano32.build.flash_mode=dio
201216
nano32.build.flash_size=4MB
217+
nano32.build.boot=bootloader
202218

203219
nano32.menu.FlashFreq.80=80MHz
204220
nano32.menu.FlashFreq.80.build.flash_freq=80m
@@ -240,6 +256,7 @@ lolin32.build.board=LOLIN32
240256
lolin32.build.f_cpu=240000000L
241257
lolin32.build.flash_mode=dio
242258
lolin32.build.flash_size=4MB
259+
lolin32.build.boot=bootloader
243260

244261
lolin32.menu.FlashFreq.80=80MHz
245262
lolin32.menu.FlashFreq.80.build.flash_freq=80m
@@ -281,6 +298,7 @@ espea32.build.board=ESPea32
281298
espea32.build.f_cpu=240000000L
282299
espea32.build.flash_mode=dio
283300
espea32.build.flash_size=4MB
301+
espea32.build.boot=bootloader
284302

285303
espea32.menu.FlashFreq.80=80MHz
286304
espea32.menu.FlashFreq.80.build.flash_freq=80m
@@ -322,6 +340,7 @@ quantum.build.board=QUANTUM
322340
quantum.build.f_cpu=240000000L
323341
quantum.build.flash_mode=qio
324342
quantum.build.flash_size=16MB
343+
quantum.build.boot=bootloader
325344

326345
quantum.menu.FlashFreq.80=80MHz
327346
quantum.menu.FlashFreq.80.build.flash_freq=80m
@@ -363,6 +382,7 @@ node32s.build.board=Node32s
363382
node32s.build.f_cpu=240000000L
364383
node32s.build.flash_mode=dio
365384
node32s.build.flash_size=4MB
385+
node32s.build.boot=bootloader
366386

367387
node32s.menu.FlashFreq.80=80MHz
368388
node32s.menu.FlashFreq.80.build.flash_freq=80m
@@ -400,9 +420,11 @@ hornbill32dev.build.mcu=esp32
400420
hornbill32dev.build.core=esp32
401421
hornbill32dev.build.variant=hornbill32dev
402422
hornbill32dev.build.board=HORNBILL_ESP32_DEV
423+
403424
hornbill32dev.build.f_cpu=240000000L
404425
hornbill32dev.build.flash_mode=dio
405426
hornbill32dev.build.flash_size=4MB
427+
hornbill32dev.build.boot=bootloader
406428

407429
hornbill32dev.menu.FlashFreq.80=80MHz
408430
hornbill32dev.menu.FlashFreq.80.build.flash_freq=80m
@@ -443,6 +465,7 @@ hornbill32minima.build.board=HORNBILL_ESP32_MINIMA
443465
hornbill32minima.build.f_cpu=240000000L
444466
hornbill32minima.build.flash_mode=dio
445467
hornbill32minima.build.flash_size=4MB
468+
hornbill32minima.build.boot=bootloader
446469

447470
hornbill32minima.menu.FlashFreq.80=80MHz
448471
hornbill32minima.menu.FlashFreq.80.build.flash_freq=80m
@@ -484,6 +507,7 @@ firebeetle32.build.board=ESP32_DEV
484507
firebeetle32.build.f_cpu=240000000L
485508
firebeetle32.build.flash_mode=dio
486509
firebeetle32.build.flash_size=4MB
510+
firebeetle32.build.boot=bootloader
487511

488512
firebeetle32.menu.FlashFreq.80=80MHz
489513
firebeetle32.menu.FlashFreq.80.build.flash_freq=80m
@@ -525,6 +549,7 @@ intorobot-fig.build.board=INTOROBOT_ESP32_DEV
525549
intorobot-fig.build.f_cpu=240000000L
526550
intorobot-fig.build.flash_mode=dio
527551
intorobot-fig.build.flash_size=4MB
552+
intorobot-fig.build.boot=bootloader
528553

529554
intorobot-fig.menu.FlashFreq.80=80MHz
530555
intorobot-fig.menu.FlashFreq.80.build.flash_freq=80m
@@ -566,6 +591,7 @@ onehorse32dev.build.board=ONEHORSE_ESP32_DEV
566591
onehorse32dev.build.f_cpu=240000000L
567592
onehorse32dev.build.flash_mode=dout
568593
onehorse32dev.build.flash_size=4MB
594+
onehorse32dev.build.boot=bootloader
569595

570596
onehorse32dev.menu.FlashFreq.80=80MHz
571597
onehorse32dev.menu.FlashFreq.80.build.flash_freq=80m
@@ -607,6 +633,7 @@ featheresp32.build.board=FEATHER_ESP32
607633
featheresp32.build.f_cpu=240000000L
608634
featheresp32.build.flash_mode=dio
609635
featheresp32.build.flash_size=4MB
636+
featheresp32.build.boot=bootloader
610637

611638
featheresp32.menu.FlashFreq.80=80MHz
612639
featheresp32.menu.FlashFreq.80.build.flash_freq=80m
@@ -628,6 +655,19 @@ featheresp32.menu.UploadSpeed.460800.upload.speed=460800
628655
featheresp32.menu.UploadSpeed.512000.windows=512000
629656
featheresp32.menu.UploadSpeed.512000.upload.speed=512000
630657

658+
featheresp32.menu.DebugLevel.none=None
659+
featheresp32.menu.DebugLevel.none.build.code_debug=0
660+
featheresp32.menu.DebugLevel.error=Error
661+
featheresp32.menu.DebugLevel.error.build.code_debug=1
662+
featheresp32.menu.DebugLevel.warn=Warn
663+
featheresp32.menu.DebugLevel.warn.build.code_debug=2
664+
featheresp32.menu.DebugLevel.info=Info
665+
featheresp32.menu.DebugLevel.info.build.code_debug=3
666+
featheresp32.menu.DebugLevel.debug=Debug
667+
featheresp32.menu.DebugLevel.debug.build.code_debug=4
668+
featheresp32.menu.DebugLevel.verbose=Verbose
669+
featheresp32.menu.DebugLevel.verbose.build.code_debug=5
670+
631671
##############################################################
632672

633673
nodemcu-32s.name=NodeMCU-32S
@@ -648,6 +688,7 @@ nodemcu-32s.build.board=NodeMCU-32S
648688
nodemcu-32s.build.f_cpu=240000000L
649689
nodemcu-32s.build.flash_mode=dio
650690
nodemcu-32s.build.flash_size=4MB
691+
nodemcu-32s.build.boot=bootloader
651692

652693
nodemcu-32s.menu.FlashFreq.80=80MHz
653694
nodemcu-32s.menu.FlashFreq.80.build.flash_freq=80m
@@ -689,6 +730,7 @@ esp32vn-iot-uno.build.board=esp32vn-iot-uno
689730
esp32vn-iot-uno.build.f_cpu=240000000L
690731
esp32vn-iot-uno.build.flash_mode=dio
691732
esp32vn-iot-uno.build.flash_size=4MB
733+
esp32vn-iot-uno.build.boot=bootloader
692734

693735
esp32vn-iot-uno.menu.FlashFreq.80=80MHz
694736
esp32vn-iot-uno.menu.FlashFreq.80.build.flash_freq=80m
@@ -730,6 +772,7 @@ esp32doit-devkit-v1.build.board=ESP32_DEV
730772
esp32doit-devkit-v1.build.f_cpu=240000000L
731773
esp32doit-devkit-v1.build.flash_mode=dio
732774
esp32doit-devkit-v1.build.flash_size=4MB
775+
esp32doit-devkit-v1.build.boot=bootloader
733776

734777
esp32doit-devkit-v1.menu.FlashFreq.80=80MHz
735778
esp32doit-devkit-v1.menu.FlashFreq.80.build.flash_freq=80m
@@ -782,6 +825,7 @@ esp32-evb.build.board=ESP32-EVB
782825
esp32-evb.build.f_cpu=240000000L
783826
esp32-evb.build.flash_mode=dio
784827
esp32-evb.build.flash_size=4MB
828+
esp32-evb.build.boot=bootloader
785829

786830
esp32-evb.menu.FlashFreq.80=80MHz
787831
esp32-evb.menu.FlashFreq.80.build.flash_freq=80m
@@ -812,6 +856,7 @@ esp32-gateway.build.board=ESP32-GATEWAY
812856
esp32-gateway.build.f_cpu=240000000L
813857
esp32-gateway.build.flash_mode=dio
814858
esp32-gateway.build.flash_size=4MB
859+
esp32-gateway.build.boot=bootloader
815860

816861
esp32-gateway.menu.FlashFreq.80=80MHz
817862
esp32-gateway.menu.FlashFreq.80.build.flash_freq=80m
@@ -842,6 +887,7 @@ espino32.build.board=ESPino32
842887
espino32.build.f_cpu=240000000L
843888
espino32.build.flash_mode=dio
844889
espino32.build.flash_size=4MB
890+
espino32.build.boot=bootloader
845891

846892
espino32.menu.FlashFreq.80=80MHz
847893
espino32.menu.FlashFreq.80.build.flash_freq=80m

‎package/package_esp32_index.template.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{
3939
"packager": "esp32",
4040
"name": "esptool",
41-
"version": "96698a3"
41+
"version": "a420774"
4242
}
4343
]
4444
}
@@ -80,21 +80,21 @@
8080
},
8181
{
8282
"name": "esptool",
83-
"version": "96698a3",
83+
"version": "a420774",
8484
"systems": [
8585
{
8686
"host": "i686-mingw32",
87-
"url": "https://dl.espressif.com/dl/esptool-96698a3-windows.zip",
88-
"archiveFileName": "esptool-96698a3-windows.zip",
89-
"checksum": "SHA-256:12f026c84869f0bd2f6a863191ec84d27b91f21d17e2e2e9e11c79be50f2d0fc",
90-
"size": "3390935"
87+
"url": "https://dl.espressif.com/dl/esptool-a420774-windows.zip",
88+
"archiveFileName": "esptool-a420774-windows.zip",
89+
"checksum": "SHA-256:7778545baa30a85a37a956e47e42a236fa67227f21b160b2164ef83a5e20a41f",
90+
"size": "3394137"
9191
},
9292
{
9393
"host": "x86_64-apple-darwin",
94-
"url": "https://dl.espressif.com/dl/esptool-96698a3-macos.tar.gz",
95-
"archiveFileName": "esptool-96698a3-macos.tar.gz",
96-
"checksum": "SHA-256:e3154dbf32c3ba5e5ebd45e913178b167cf761e5ce0152b2bb069a2453f6839b",
97-
"size": "3805789"
94+
"url": "https://dl.espressif.com/dl/esptool-a420774-macos.tar.gz",
95+
"archiveFileName": "esptool-a420774-macos.tar.gz",
96+
"checksum": "SHA-256:1a6237b695fe299357bfd78a9727564464a00e020bc7c7a4cf6fad02250eb2a2",
97+
"size": "3808980"
9898
}
9999
]
100100
}

‎platform.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ compiler.warning_flags.all=-Wall -Werror=all -Wextra
2121

2222
compiler.path={runtime.tools.xtensa-esp32-elf-gcc.path}/bin/
2323
compiler.sdk.path={runtime.platform.path}/tools/sdk
24-
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bluedroid" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mbedtls_port" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
24+
compiler.cpreprocessor.flags=-DESP_PLATFORM -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DHAVE_CONFIG_H "-I{compiler.sdk.path}/include/config" "-I{compiler.sdk.path}/include/bluedroid" "-I{compiler.sdk.path}/include/app_trace" "-I{compiler.sdk.path}/include/app_update" "-I{compiler.sdk.path}/include/bootloader_support" "-I{compiler.sdk.path}/include/bt" "-I{compiler.sdk.path}/include/driver" "-I{compiler.sdk.path}/include/esp32" "-I{compiler.sdk.path}/include/ethernet" "-I{compiler.sdk.path}/include/fatfs" "-I{compiler.sdk.path}/include/freertos" "-I{compiler.sdk.path}/include/heap" "-I{compiler.sdk.path}/include/jsmn" "-I{compiler.sdk.path}/include/log" "-I{compiler.sdk.path}/include/mdns" "-I{compiler.sdk.path}/include/mbedtls" "-I{compiler.sdk.path}/include/mbedtls_port" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/nvs_flash" "-I{compiler.sdk.path}/include/openssl" "-I{compiler.sdk.path}/include/soc" "-I{compiler.sdk.path}/include/spi_flash" "-I{compiler.sdk.path}/include/sdmmc" "-I{compiler.sdk.path}/include/tcpip_adapter" "-I{compiler.sdk.path}/include/ulp" "-I{compiler.sdk.path}/include/vfs" "-I{compiler.sdk.path}/include/wear_levelling" "-I{compiler.sdk.path}/include/xtensa-debug-module" "-I{compiler.sdk.path}/include/newlib" "-I{compiler.sdk.path}/include/coap" "-I{compiler.sdk.path}/include/wpa_supplicant" "-I{compiler.sdk.path}/include/expat" "-I{compiler.sdk.path}/include/json" "-I{compiler.sdk.path}/include/nghttp" "-I{compiler.sdk.path}/include/lwip"
2525

2626
compiler.c.cmd=xtensa-esp32-elf-gcc
2727
compiler.c.flags=-std=gnu99 -Os -g3 -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith {compiler.warning_flags} -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-old-style-declaration -MMD -c
@@ -33,8 +33,8 @@ compiler.S.cmd=xtensa-esp32-elf-gcc
3333
compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
3434

3535
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
36-
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
37-
compiler.c.elf.libs=-lgcc -lstdc++ -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lcore -lcxx -ldriver -lesp32 -lethernet -lexpat -lfatfs -lfreertos -lhal -ljsmn -ljson -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module
36+
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority
37+
compiler.c.elf.libs=-lgcc -lstdc++ -lapp_trace -lapp_update -lbootloader_support -lbt -lbtdm_app -lc -lc_nano -lcoap -lcoexist -lcore -lcxx -ldriver -lesp32 -lethernet -lexpat -lfatfs -lfreertos -lhal -lheap -ljsmn -ljson -llibsodium -llog -llwip -lm -lmbedtls -lmdns -lmicro-ecc -lnet80211 -lnewlib -lnghttp -lnvs_flash -lopenssl -lphy -lpp -lrtc -lsdmmc -lsmartconfig -lsoc -lspi_flash -ltcpip_adapter -lulp -lvfs -lwear_levelling -lwpa -lwpa2 -lwpa_supplicant -lwps -lxtensa-debug-module
3838

3939
compiler.as.cmd=xtensa-esp32-elf-as
4040

@@ -44,6 +44,7 @@ compiler.ar.flags=cru
4444
compiler.size.cmd=xtensa-esp32-elf-size
4545

4646
# This can be overriden in boards.txt
47+
build.boot=bootloader
4748
build.code_debug=0
4849
build.extra_flags=-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug}
4950

@@ -91,5 +92,5 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
9192
tools.esptool.upload.protocol=esp32
9293
tools.esptool.upload.params.verbose=
9394
tools.esptool.upload.params.quiet=
94-
tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin"
95+
tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
9596
tools.esptool.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"

0 commit comments

Comments
 (0)