From 50a0b00afacc5cea4bbe4f42c94bd2f28932ae9f Mon Sep 17 00:00:00 2001 From: Konstantin Kondrashov Date: Fri, 15 Mar 2019 20:02:16 +0800 Subject: [PATCH] esp_tool: Exclude elf-sha256 from bootloader Closes: IDFGH-690 --- components/esptool_py/Makefile.projbuild | 2 ++ components/esptool_py/project_include.cmake | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild index 25f2487ab..092ac0e02 100644 --- a/components/esptool_py/Makefile.projbuild +++ b/components/esptool_py/Makefile.projbuild @@ -39,7 +39,9 @@ endif endif endif +ifndef IS_BOOTLOADER_BUILD 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) diff --git a/components/esptool_py/project_include.cmake b/components/esptool_py/project_include.cmake index 2d05f11a7..d03552723 100644 --- a/components/esptool_py/project_include.cmake +++ b/components/esptool_py/project_include.cmake @@ -52,7 +52,9 @@ if(CONFIG_SECURE_BOOT_ENABLED AND ${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} --secure-pad) 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) # Set ESPFLASHSIZE to 'detect' *after* elf2image options are generated,