From 82fa02bcac5e278586cb2e3c9cc597699f6f640d Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sat, 5 Apr 2025 11:10:12 +0200
Subject: fw: btl: Configure bootloader build with Meson

CMake ExternalProject creates a pretty confusing build tree. Since the
rest of the project anyway starts moving to Meson the bootloader is
configured via Meson as a first step.
---
 fw/rtos/modules/meson.build | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fw/rtos/modules/meson.build

(limited to 'fw/rtos/modules')

diff --git a/fw/rtos/modules/meson.build b/fw/rtos/modules/meson.build
new file mode 100644
index 0000000..52f50c2
--- /dev/null
+++ b/fw/rtos/modules/meson.build
@@ -0,0 +1,8 @@
+zephyr_modules = [
+  meson.current_source_dir() / 'cmsis',
+  meson.current_source_dir() / 'hal_stm32',
+  meson.current_source_dir() / 'mbedtls',
+  meson.current_source_dir() / 'mcuboot',
+]
+
+bootloader_firmware = meson.current_source_dir() / 'mcuboot' / 'boot' / 'zephyr'
-- 
cgit v1.2.3-70-g09d2


From f6f6d285c318d28bddfb99cf04104a5306a97c78 Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sun, 6 Apr 2025 19:05:20 +0200
Subject: fw: app: Add image signing to Meson build

This automates signing the application firmware image for the MCUboot
bootloader.
---
 fw/app/meson.build          | 19 ++++++++++++++++++-
 fw/rtos/modules/meson.build |  4 +++-
 web/layouts/home.html       |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'fw/rtos/modules')

diff --git a/fw/app/meson.build b/fw/app/meson.build
index d477331..97c17f1 100644
--- a/fw/app/meson.build
+++ b/fw/app/meson.build
@@ -14,7 +14,8 @@ external_project.add_project(
   verbose: true,
 )
 
-application = custom_target('application',
+application = custom_target(
+  'application',
   output: ['application.bin'],
   command: [
     build_zephyr,
@@ -22,7 +23,23 @@ application = custom_target('application',
     '--binary-name', 'zephyr.bin',
     '--target-name', 'application.bin',
   ],
+)
+
+application_signed = custom_target(
+  'application_signed',
+  output: ['application.signed.bin'],
+  command: [
+    imgtool,
+    'sign',
+    '--version', '0.0.0',
+    '--header-size', '0x200',
+    '--slot-size', '0xc0000',
+    '--key', signing_key,
+    meson.current_build_dir() / 'application.bin',
+    meson.current_build_dir() / 'application.signed.bin',
+  ],
   build_by_default: true,
+  depends: application,
   install: true,
   install_dir: 'website/static',
 )
diff --git a/fw/rtos/modules/meson.build b/fw/rtos/modules/meson.build
index 52f50c2..14b14f5 100644
--- a/fw/rtos/modules/meson.build
+++ b/fw/rtos/modules/meson.build
@@ -5,4 +5,6 @@ zephyr_modules = [
   meson.current_source_dir() / 'mcuboot',
 ]
 
-bootloader_firmware = meson.current_source_dir() / 'mcuboot' / 'boot' / 'zephyr'
+mcuboot = meson.current_source_dir() / 'mcuboot'
+bootloader_firmware = mcuboot / 'boot' / 'zephyr'
+imgtool = mcuboot / 'scripts' / 'imgtool.py'
diff --git a/web/layouts/home.html b/web/layouts/home.html
index f4c4e80..6bc457c 100644
--- a/web/layouts/home.html
+++ b/web/layouts/home.html
@@ -3,7 +3,7 @@
 <ul>
 	<li><a href="static/bill-of-materials.csv">bill-of-materials.csv</a></li>
 	<li><a href="static/schematic.pdf">schematic.pdf</a></li>
-	<li><a href="static/application.bin">application.bin</a></li>
+	<li><a href="static/application.signed.bin">application.signed.bin</a></li>
 	<li><a href="static/bootloader.bin">bootloader.bin</a></li>
 	<li><a href="static/simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li>
 </ul>
-- 
cgit v1.2.3-70-g09d2