mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'feature/esptool_allow_no_stub' into 'master'
Allow esptool's download stub to be disabled by other options and applications See merge request espressif/esp-idf!10114
This commit is contained in:
commit
e95c8c1d66
@ -763,6 +763,7 @@ menu "Security features"
|
||||
config SECURE_ENABLE_SECURE_ROM_DL_MODE
|
||||
bool "Permanently switch to ROM UART Secure Download mode"
|
||||
depends on SECURE_TARGET_HAS_SECURE_ROM_DL_MODE && !SECURE_DISABLE_ROM_DL_MODE
|
||||
select ESPTOOLPY_NO_STUB
|
||||
help
|
||||
If set, during startup the app will burn an eFuse bit to permanently switch the UART ROM
|
||||
Download Mode into a separate Secure Download mode. This option can only work if
|
||||
|
@ -27,10 +27,10 @@ if(NOT BOOTLOADER_BUILD)
|
||||
set(ESPTOOLPY_BEFORE "${CONFIG_ESPTOOLPY_BEFORE}")
|
||||
set(ESPTOOLPY_AFTER "${CONFIG_ESPTOOLPY_AFTER}")
|
||||
set(ESPTOOLPY_CHIP "${target}")
|
||||
if(CONFIG_ESPTOOLPY_WITH_STUB)
|
||||
set(ESPTOOLPY_WITH_STUB true)
|
||||
else()
|
||||
if(CONFIG_ESPTOOLPY_NO_STUB)
|
||||
set(ESPTOOLPY_WITH_STUB false)
|
||||
else()
|
||||
set(ESPTOOLPY_WITH_STUB true)
|
||||
endif()
|
||||
|
||||
if(CONFIG_SECURE_BOOT OR CONFIG_SECURE_FLASH_ENC_ENABLED)
|
||||
|
@ -54,11 +54,12 @@ menu "Serial flasher config"
|
||||
decompress it on the fly before flashing it. For most payloads, this should result in a
|
||||
speed increase.
|
||||
|
||||
config ESPTOOLPY_WITH_STUB
|
||||
# Only real reason to disable this is when ESP32-S2 Secure Download Mode is set
|
||||
bool
|
||||
default "y"
|
||||
depends on !SECURE_ENABLE_SECURE_ROM_DL_MODE
|
||||
config ESPTOOLPY_NO_STUB
|
||||
bool "Disable download stub"
|
||||
default "n"
|
||||
help
|
||||
The flasher tool sends a precompiled download stub first by default. That stub allows things
|
||||
like compressed downloads and more. Usually you should not need to disable that feature
|
||||
|
||||
choice ESPTOOLPY_FLASHMODE
|
||||
prompt "Flash SPI mode"
|
||||
|
@ -160,7 +160,7 @@ else()
|
||||
list(APPEND esptool_flash_main_args "--after=${CONFIG_ESPTOOLPY_AFTER}")
|
||||
endif()
|
||||
|
||||
if(NOT CONFIG_ESPTOOLPY_WITH_STUB)
|
||||
if(CONFIG_ESPTOOLPY_NO_STUB)
|
||||
list(APPEND esptool_flash_main_args "--no-stub")
|
||||
endif()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user