esp32: Add makeimg.py script to build full firmware; use it in Makefile.

dpgeorge · dpgeorge · commit 7cf33129eea8 · 2017-03-14T12:50:04.000+11:00
Thanks to Nick Moore for the initial code using dd.
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -538,16 +538,20 @@ OBJ_ESPIDF += $(addprefix $(BUILD)/, $(ESPIDF_WPA_SUPPLICANT_O))
 ################################################################################
 # Main targets
 
-all: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/application.bin
+all: $(BUILD)/firmware.bin
 
 .PHONY: idf-version deploy erase
 
 idf-version:
 	$(ECHO) "ESP IDF supported hash: $(ESPIDF_SUPHASH)"
 
-deploy: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/application.bin
+$(BUILD)/firmware.bin: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/application.bin
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) makeimg.py $^ $@
+
+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) 0x1000 $(BUILD)/bootloader.bin 0x8000 $(BUILD)/partitions.bin 0x10000 $(BUILD)/application.bin
+	$(Q)$(ESPTOOL) --chip esp32 --port $(PORT) --baud $(BAUD) write_flash -z --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) --flash_size $(FLASH_SIZE) 0 $^
 
 erase:
 	$(ECHO) "Erasing flash"
diff --git a/esp32/makeimg.py b/esp32/makeimg.py
@@ -0,0 +1,25 @@
+import sys
+
+OFFSET_BOOTLOADER = 0x1000
+OFFSET_PARTITIONS = 0x8000
+OFFSET_APPLICATION = 0x10000
+
+files_in = [
+    ('bootloader', OFFSET_BOOTLOADER, sys.argv[1]),
+    ('partitions', OFFSET_PARTITIONS, sys.argv[2]),
+    ('application', OFFSET_APPLICATION, sys.argv[3]),
+]
+file_out = sys.argv[4]
+
+cur_offset = 0
+with open(file_out, 'wb') as fout:
+    for name, offset, file_in in files_in:
+        assert offset >= cur_offset
+        fout.write(b'\xff' * (offset - cur_offset))
+        cur_offset = offset
+        with open(file_in, 'rb') as fin:
+            data = fin.read()
+            fout.write(data)
+            cur_offset += len(data)
+            print('%-12s% 8d' % (name, len(data))) 
+    print('%-12s% 8d' % ('total', cur_offset))
