esp32: Make firmware.bin start at 0x1000 to allow flash size autodetect.

dpgeorge · dpgeorge · commit 96de4d137fa9 · 2017-07-24T16:14:04.000+10:00
The firmware.bin file must now be flashed starting at address 0x1000, and
it should no longer matter what flash size the firmware was built for.
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -578,7 +578,7 @@ $(BUILD)/firmware.bin: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/
 
 deploy: $(BUILD)/firmware.bin
 	$(ECHO) "Writing $^ to the board"
-	$(Q)$(ESPTOOL) --chip esp32 --port $(PORT) --baud $(BAUD) write_flash -z --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) --flash_size $(FLASH_SIZE) 0 $^
+	$(Q)$(ESPTOOL) --chip esp32 --port $(PORT) --baud $(BAUD) write_flash -z --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) 0x1000 $^
 
 erase:
 	$(ECHO) "Erasing flash"
diff --git a/esp32/makeimg.py b/esp32/makeimg.py
@@ -11,7 +11,7 @@
 ]
 file_out = sys.argv[4]
 
-cur_offset = 0
+cur_offset = OFFSET_BOOTLOADER
 with open(file_out, 'wb') as fout:
     for name, offset, file_in in files_in:
         assert offset >= cur_offset

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`]`
`12`	`12`	`file_out = sys.argv[4]`
`13`	`13`
`14`		`-cur_offset = 0`
	`14`	`+cur_offset = OFFSET_BOOTLOADER`
`15`	`15`	`with open(file_out, 'wb') as fout:`
`16`	`16`	`for name, offset, file_in in files_in:`
`17`	`17`	`assert offset >= cur_offset`