From f738f277c8cb29156cd8546c909cd01be407a41a Mon Sep 17 00:00:00 2001
From: "Peter D. Gray" <peter@conalgo.com>
Date: Tue, 9 Jan 2024 10:50:08 -0500
Subject: [PATCH] Generalize for Q

---
 stm32/recovery-image/Makefile  | 7 ++++---
 stm32/recovery-image/README.md | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/stm32/recovery-image/Makefile b/stm32/recovery-image/Makefile
index 5dd6081a..67a6bb91 100644
--- a/stm32/recovery-image/Makefile
+++ b/stm32/recovery-image/Makefile
@@ -8,15 +8,16 @@ export MTOOLSRC=mtools.conf
 MFORMAT=mformat
 MCOPY=mcopy
 
-RELEASES = $(wildcard ../../releases/*-mk4-*.dfu) $(wildcard ../*-mk4-RC1*.dfu)
+RELEASES = $(wildcard ../../releases/*-mk4-*.dfu) $(wildcard ../*-mk4-RC1*.dfu) \
+           $(wildcard ../../releases/*-q1-*.dfu) $(wildcard ../*-q1-RC1*.dfu)
 
-OUTPUT = mk4-recovery-$(shell date +%F).img.xz
+OUTPUT = cc-recovery-$(shell date +%F).img.xz
 
 all: output.img
 
 output.img: $(RELEASES) Makefile
 	dd if=/dev/zero of=output.img bs=1024 count=160
-	$(MFORMAT) -v MK4RECOVER -f 160 -N 2022 -C z:
+	$(MFORMAT) -v CCRECOVER -f 160 -N 2022 -C z:
 	ls -1 $(RELEASES) | sort -n > flist.txt
 	cat internal-readme.txt flist.txt > tmp.txt
 	$(MCOPY) -bsmp tmp.txt z:README.TXT
diff --git a/stm32/recovery-image/README.md b/stm32/recovery-image/README.md
index dbe2720c..f583038c 100644
--- a/stm32/recovery-image/README.md
+++ b/stm32/recovery-image/README.md
@@ -14,4 +14,4 @@ side-loading or up/downgrade attacks.
 
 This directory holds data and code to build a special SD-card disk
 image with all possible releases. The goal is a single disk image that
-can be used restore a Mk4 Coldcard of any (intended) version.
+can be used restore a Coldcard of any (intended) version.