From 4428535b51e063c268215b5817e0a1f9f43b6b72 Mon Sep 17 00:00:00 2001 From: Jeroen Domburg Date: Thu, 21 Jan 2016 16:36:46 +0800 Subject: [PATCH] Fixes to flash size calculation things --- Makefile.combined | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.combined b/Makefile.combined index f3ea76a..0cbbd3b 100644 --- a/Makefile.combined +++ b/Makefile.combined @@ -10,9 +10,11 @@ TARGET_OUT := $(addprefix $(BUILD_BASE)/,$(TARGET).out) .PHONY: ldscript_memspecific.ld + 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 + $(Q) echo "MEMORY { irom0_0_seg : org = 0x40240000, len = "$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*1024-0x4000)))" }"> ldscript_memspecific.ld + $(TARGET_OUT): $(APP_AR) $(EXTRA_LD_SCRIPTS) $(vecho) "LD $@" @@ -28,5 +30,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 $(SDK_BASE)/bin/esp_init_data_default.bin + $(Q) $(ESPTOOL) $(ESPTOOL_OPTS) write_flash $(ESPTOOL_FLASHDEF) 0x7E000 $(SDK_BASE)/bin/blank.bin 0x7F000 $(SDK_BASE)/bin/esp_init_data_default.bin