espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_tool: Exclude elf-sha256 from bootloader

Browse Source 
Closes: IDFGH-690
This commit is contained in:
Konstantin Kondrashov
2019-03-15 20:02:16 +08:00
parent 8fbb63c2a7
commit 98db4d2eb6
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esptool_py/Makefile.projbuild
View File

@@ -39,7 +39,9 @@ endif
endif endif
endif endif
ifndef IS_BOOTLOADER_BUILD
ESPTOOL_ELF2IMAGE_OPTIONS += --elf-sha256-offset 0xb0 ESPTOOL_ELF2IMAGE_OPTIONS += --elf-sha256-offset 0xb0
endif
ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z,-u) $(ESPTOOL_WRITE_FLASH_OPTIONS) ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z,-u) $(ESPTOOL_WRITE_FLASH_OPTIONS)

4
components/esptool_py/project_include.cmake
View File

@@ -52,7 +52,9 @@ if(CONFIG_SECURE_BOOT_ENABLED AND
${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} --secure-pad) ${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} --secure-pad)
endif() endif()
set(ESPTOOLPY_ELF2IMAGE_OPTIONS --elf-sha256-offset 0xb0) if(NOT BOOTLOADER_BUILD)
set(ESPTOOLPY_ELF2IMAGE_OPTIONS --elf-sha256-offset 0xb0)
endif()
if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT) if(CONFIG_ESPTOOLPY_FLASHSIZE_DETECT)
# Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated, # Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated,