From 2af36652a71483b69b2cfb9d4a9291bc4096a5c1 Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Sun, 1 Jul 2018 18:15:08 +0300 Subject: [PATCH] esptool_py: remove esp-idf app concept apeos design implies that apps are deployable independently of the operating system. In contrast, in the esp-idf concept being removed, single app is deployable through esp-idf at fixed flash offset. --- components/esptool_py/Makefile.projbuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild index 835ce79..8b40eef 100644 --- a/components/esptool_py/Makefile.projbuild +++ b/components/esptool_py/Makefile.projbuild @@ -1,4 +1,5 @@ # Copyright 2016-2017 Espressif Systems (Shanghai) PTE LTD +# Copyright 2018 apeos contributors # # Component support for esptool.py. Doesn't do much by itself, # components have their own flash targets that can use these variables. @@ -48,8 +49,6 @@ ESPTOOL_ELF2IMAGE_OPTIONS := ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z,-u) $(ESPTOOL_WRITE_FLASH_OPTIONS) -ESPTOOL_ALL_FLASH_ARGS += $(CONFIG_APP_OFFSET) $(APP_BIN) - ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES ifndef IS_BOOTLOADER_BUILD # for locally signed secure boot image, add a signing step to get from unsigned app to signed app @@ -66,15 +65,13 @@ $(APP_BIN_UNSIGNED): $(APP_ELF) $(ESPTOOLPY_SRC) $(ESPTOOLPY) elf2image $(ESPTOOL_FLASH_OPTIONS) $(ESPTOOL_ELF2IMAGE_OPTIONS) -o $@ $< flash: all_binaries $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash) - @echo "Flashing binaries to serial port $(ESPPORT) (app at offset $(CONFIG_APP_OFFSET))..." + @echo "Flashing binaries to serial port $(ESPPORT)..." ifdef CONFIG_SECURE_BOOT_ENABLED @echo "(Secure boot enabled, so bootloader not flashed automatically. See 'make bootloader' output)" endif $(ESPTOOLPY_WRITE_FLASH) $(ESPTOOL_ALL_FLASH_ARGS) app-flash: $(APP_BIN) $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash) - @echo "Flashing app to serial port $(ESPPORT), offset $(CONFIG_APP_OFFSET)..." - $(ESPTOOLPY_WRITE_FLASH) $(CONFIG_APP_OFFSET) $(APP_BIN) # Submodules normally added in component.mk, but can be added # at the project level as long as qualified path -- 2.11.4.GIT