From 1f51e6035b43109a6b79feb6cdd31a22fb65f403 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Mon, 25 Jan 2016 15:49:46 +0800 Subject: [PATCH] Make blankflash target automatically calculate pos to write to --- Makefile.combined | 4 +++- Makefile.separate | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.combined b/Makefile.combined index 0cbbd3b..3f84f51 100644 --- a/Makefile.combined +++ b/Makefile.combined @@ -10,6 +10,8 @@ TARGET_OUT := $(addprefix $(BUILD_BASE)/,$(TARGET).out) .PHONY: ldscript_memspecific.ld +BLANKPOS="$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*1024-0x2000)))" +INITDATAPOS="$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*1024-0x4000)))" ldscript_memspecific.ld: $(vecho) "GEN $@" @@ -30,5 +32,5 @@ flash: $(TARGET_OUT) $(FW_BASE) $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) 0x00000 $(FW_BASE)/0x00000.bin 0x40000 $(FW_BASE)/0x40000.bin blankflash: - $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) 0x7E000 $(SDK_BASE)/bin/blank.bin 0x7F000 $(SDK_BASE)/bin/esp_init_data_default.bin + $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) $(BLANKPOS) $(SDK_BASE)/bin/blank.bin $(INITDATAPOS) $(SDK_BASE)/bin/esp_init_data_default.bin diff --git a/Makefile.separate b/Makefile.separate index 5bdad2f..c276dfe 100644 --- a/Makefile.separate +++ b/Makefile.separate @@ -10,6 +10,9 @@ TARGET_OUT := $(addprefix $(BUILD_BASE)/,$(TARGET).out) .PHONY: ldscript_memspecific.ld +BLANKPOS="$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*1024-0x2000)))" +INITDATAPOS="$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*1024-0x4000)))" + ldscript_memspecific.ld: $(vecho) "GEN $@" $(Q) echo "MEMORY { irom0_0_seg : org = 0x40240000, len = "$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE)-0x4000)))" }"> ldscript_memspecific.ld @@ -27,7 +30,7 @@ flash: $(TARGET_OUT) $(FW_BASE) $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) 0x00000 $(FW_BASE)/0x00000.bin 0x40000 $(FW_BASE)/0x40000.bin blankflash: - $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) 0x7E000 $(SDK_BASE)/bin/blank.bin 0x7C000 $(SDK_BASE)/bin/esp_init_data_default.bin + $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) $(BLANKPOS) $(SDK_BASE)/bin/blank.bin $(INITDATAPOS) $(SDK_BASE)/bin/esp_init_data_default.bin htmlflash: libesphttpd $(Q) if [ $$(stat -c '%s' libesphttpd/webpages.espfs) -gt $$(( $(ESPFS_SIZE) )) ]; then echo "webpages.espfs too big!"; false; fi