quick 5.1.1 release to get back under size limit

releases/ChangeLog.md

@@ -1,3 +1,9 @@
+## 5.1.1 - 2023-02-27
+
+- Bugfix: Same as 5.1.0 but corrects issue which prevented 5.1.0 from being upgraded
+  over SD card. No functional changes.
+
+
 ## 5.1.0 - 2023-02-27
 
 - New Feature: "MicroSD card as Second Factor". Specially marked MicroSD card must be

shared/actions.py

@@ -224,8 +224,10 @@ async def microsd_upgrade(*a):
     # - erase serial flash
     # - copy it over (slow)
     # - reboot into bootloader, which finishes install
+    from sigheader import FW_HEADER_OFFSET, FW_HEADER_SIZE, FW_MAX_LENGTH_MK4
 
-    fn = await file_picker('Pick firmware image to use (.DFU)', suffix='.dfu', min_size=0x7800)
+    fn = await file_picker('Pick firmware image to use (.DFU)', suffix='.dfu',
+                                    min_size=0x7800, max_size=FW_MAX_LENGTH_MK4)
 
     if not fn: return
 
@@ -245,7 +247,6 @@ async def microsd_upgrade(*a):
             offset, size = dfu_parse(fp)
 
             # we also put a copy of special signed heaer at the end of the flash
-            from sigheader import FW_HEADER_OFFSET, FW_HEADER_SIZE
 
             # read just the signature header
             hdr = bytearray(FW_HEADER_SIZE)

shared/manifest_mk4.py

@@ -6,5 +6,8 @@ freeze_as_mpy('', [
 	'nfc.py',
 	'ndef.py',
 	'trick_pins.py',
-	'graphics_mk4.py',
 ], opt=0)
+
+freeze_as_mpy('', [
+	'graphics_mk4.py',
+], opt=3)

stm32/shared.mk

@@ -99,8 +99,10 @@ rc1:
 	$(SUBMAKE) DEBUG_BUILD=0 all
 	$(SIGNIT) sign -b $(BUILD_DIR) -m $(MK_NUM) $(VERSION_STRING) $(PROD_KEYNUM) -o rc1.bin
 	$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):rc1.bin \
-		-b $(BOOTLOADER_BASE):$(BOOTLOADER_DIR)/releases/$(BOOTLOADER_VERSION)/bootloader.bin \
 		`signit version rc1.bin`-mk$(MK_NUM)-RC1-coldcard.dfu
+	$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):rc1.bin \
+		-b $(BOOTLOADER_BASE):$(BOOTLOADER_DIR)/releases/$(BOOTLOADER_VERSION)/bootloader.bin \
+		`signit version rc1.bin`-mk$(MK_NUM)-RC1-factory-coldcard.dfu
 	ls -1 *-RC1-*.dfu
 
 # This target just combines latest version of production firmware with bootrom into a DFU
@@ -113,9 +115,10 @@ release-products: built/production.bin
 	cp built/file_time.c $(BOARD)/file_time.c
 	-git commit $(BOARD)/file_time.c -m "For $(NEW_VERSION)"
 	$(SIGNIT) sign -m $(MK_NUM) $(VERSION_STRING) -r built/production.bin $(PROD_KEYNUM) -o built/production.bin
+	$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):built/production.bin $(RELEASE_FNAME)
 	$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):built/production.bin \
 		-b $(BOOTLOADER_BASE):$(BOOTLOADER_DIR)/releases/$(BOOTLOADER_VERSION)/bootloader.bin \
-		$(RELEASE_FNAME)
+		factory-$(RELEASE_FNAME)
 	@echo
 	@echo 'Made release: ' $(RELEASE_FNAME)
 	@echo

stm32/version.mk

@@ -1,4 +1,4 @@
 
 # Our version for this release.
-VERSION_STRING = 5.1.0
+VERSION_STRING = 5.1.1