From 3f61182a88c46fd1f812544588b0cf5a001de29e Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Fri, 30 Sep 2022 11:34:09 +0200
Subject: [PATCH 1/3] Doc how qemu needs to be built; nits

---
 hw/application_fpga/fw/mta1_mkdf/README.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/hw/application_fpga/fw/mta1_mkdf/README.md b/hw/application_fpga/fw/mta1_mkdf/README.md
index 85b66a5..c563456 100644
--- a/hw/application_fpga/fw/mta1_mkdf/README.md
+++ b/hw/application_fpga/fw/mta1_mkdf/README.md
@@ -5,8 +5,8 @@
 You need Clang with 32 bit RISC-V support. You can check this with:
 
 ```
-  $ llc --version|grep riscv32
-      riscv32    - 32-bit RISC-V
+$ llc --version | grep riscv32
+    riscv32    - 32-bit RISC-V
 ```
 
 or just try building.
@@ -24,18 +24,21 @@ Checkout the `mta1` branch of [our version of the
 qemu](https://github.com/tillitis/qemu) and build:
 
 ```
-  $ git clone -b mta1 https://github.com/tillitis/qemu
-  $ mkdir qemu/build
-  $ cd qemu/build
-  $ ../configure --target-list=riscv32-softmmu
-  $ make -j $(nproc)
+$ git clone -b mta1 https://github.com/tillitis/qemu
+$ mkdir qemu/build
+$ cd qemu/build
+$ ../configure --target-list=riscv32-softmmu --disable-werror
+$ make -j $(nproc)
 ```
 
+(Built with warnings-as-errors disabled, see [this
+issue](https://github.com/tillitis/qemu/issues/3).)
+
 Run it like this:
 
 ```
-  $ /path/to/qemu/build/qemu-system-riscv32 -nographic -M mta1_mkdf,fifo=chrid -bios firmware \
--chardev pty,id=chrid
+$ /path/to/qemu/build/qemu-system-riscv32 -nographic -M mta1_mkdf,fifo=chrid -bios firmware.elf \
+  -chardev pty,id=chrid
 ```
 
 This attaches the FIFO to a tty, something like `/dev/pts/16` which

From ffa0bb48cbc00c7747cfbcf78f825a896895662e Mon Sep 17 00:00:00 2001
From: Michael Cardell Widerkrantz <mc@mullvad.net>
Date: Fri, 30 Sep 2022 13:34:47 +0200
Subject: [PATCH 2/3] Doc: Add a warning about USS to release notes

---
 doc/release_notes.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/release_notes.md b/doc/release_notes.md
index b930b35..896c8c1 100644
--- a/doc/release_notes.md
+++ b/doc/release_notes.md
@@ -1,5 +1,16 @@
 # Release Notes
 
+## Untagged
+
+### User Supplied Secret - Breaking change!
+
+*Nota bene* From commit 99efb78ed8ba69799045cff6c42c4a71bffdb703 the
+computed CDI secret is also taking the User Supplied Secret into
+account *even if the USS is not supplied*! This means if you start
+using firmware from this commit and onwards your CDI and with it the
+private key of the signerapp will change even if you haven't changed
+the app in any way.
+
 ## engineering-release-1
 
 ### Hardware

From 0d16dd595994d7dff1f1eca842c1834cc3e84286 Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Mon, 3 Oct 2022 08:06:29 +0200
Subject: [PATCH 3/3] Adjust flashing after frequency bump

---
 hw/application_fpga/fw/mta1_mkdf/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/application_fpga/fw/mta1_mkdf/main.c b/hw/application_fpga/fw/mta1_mkdf/main.c
index ad5b7be..630f3b2 100644
--- a/hw/application_fpga/fw/mta1_mkdf/main.c
+++ b/hw/application_fpga/fw/mta1_mkdf/main.c
@@ -83,7 +83,7 @@ int main()
 
 	for (;;) {
 		// blocking; fw flashing white while waiting for cmd
-		in = readbyte_ledflash(LED_RED | LED_BLUE | LED_GREEN, 500000);
+		in = readbyte_ledflash(LED_RED | LED_BLUE | LED_GREEN, 800000);
 
 		if (parseframe(in, &hdr) == -1) {
 			puts("Couldn't parse header\n");