pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/make_erase_flash' into 'master'

Browse Source 
build system: Fix bug where erase_flash was always invoked for flash

Order-only prerequisites do not work for phony targets!

See merge request !337
This commit is contained in:
Ivan Grokhotkov
2016-12-25 09:13:58 +08:00
parent 28aa7ba658 abb7668af7
commit 05fcdcfedb
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bootloader/Makefile.projbuild
+1 -1
View File
@@ -43,7 +43,7 @@ bootloader: $(BOOTLOADER_BIN)
ESPTOOL_ALL_FLASH_ARGS += $(BOOTLOADER_OFFSET) $(BOOTLOADER_BIN)
bootloader-flash: $(BOOTLOADER_BIN) | erase_flash
bootloader-flash: $(BOOTLOADER_BIN) $(call prereq_if_explicit,erase_flash)
$(ESPTOOLPY_WRITE_FLASH) 0x1000 $^
else ifdef CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH