diff --git a/common.mk b/common.mk index f94752d..82a6cc1 100644 --- a/common.mk +++ b/common.mk @@ -246,7 +246,7 @@ $(FW_FILE): $(PROGRAM_OUT) $(FIRMWARE_DIR) flash: all $(if will_flash, $(call will_flash, "flash")) $(ESPTOOL) -p $(ESPPORT) --baud $(ESPBAUD) write_flash $(ESPTOOL_ARGS) \ - 0x0 $(RBOOT_BIN) 0x1000 $(RBOOT_CONF) 0x2000 $(FW_FILE) $(SPIFFS_ESPTOOL_ARGS) + $(RBOOT_ARGS) 0x2000 $(FW_FILE) $(SPIFFS_ESPTOOL_ARGS) $(if did_flash, $(call did_flash, "flash")) erase_flash: diff --git a/parameters.mk b/parameters.mk index 4dede4e..d133ef5 100644 --- a/parameters.mk +++ b/parameters.mk @@ -130,6 +130,7 @@ CPPFLAGS += -DGITSHORTREV=$(GITSHORTREV) LINKER_SCRIPTS += $(ROOT)ld/program.ld $(ROOT)ld/rom.ld # rboot firmware binary paths for flashing +RBOOT_ARGS ?= 0x0 $(RBOOT_BIN) 0x1000 $(RBOOT_CONF) RBOOT_BIN = $(ROOT)bootloader/firmware/rboot.bin RBOOT_PREBUILT_BIN = $(ROOT)bootloader/firmware_prebuilt/rboot.bin RBOOT_CONF = $(ROOT)bootloader/firmware_prebuilt/blank_config.bin