From 1fcf9bd0d1af10c57a67d90496b5406244ca25ba Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sun, 23 Mar 2025 18:33:19 +0100
Subject: fw: rtos: modules: Move mcuboot submodule here

The mcuboot Git submodule used to be located in `fw/btl`. Nevertheless
since it is also a Zephyr module it should go to `fw/rtos/modules`. This
makes sure all Zephyr modules are at the same place.
---
 .gitmodules             | 2 +-
 fw/CMakeLists.txt       | 4 ++--
 fw/btl/mcuboot          | 1 -
 fw/rtos/modules/mcuboot | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 160000 fw/btl/mcuboot
 create mode 160000 fw/rtos/modules/mcuboot

diff --git a/.gitmodules b/.gitmodules
index efc84df..2e70fd7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,5 +11,5 @@
 	path = fw/rtos/modules/mbedtls
 	url = https://github.com/zephyrproject-rtos/mbedtls.git
 [submodule "fw/zephyrproject/bootloader/mcuboot"]
-	path = fw/btl/mcuboot
+	path = fw/rtos/modules/mcuboot
 	url = https://github.com/zephyrproject-rtos/mcuboot.git
diff --git a/fw/CMakeLists.txt b/fw/CMakeLists.txt
index f51689b..e2c649e 100644
--- a/fw/CMakeLists.txt
+++ b/fw/CMakeLists.txt
@@ -9,7 +9,7 @@ set(ZEPHYR_MODULES
 	"${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/cmsis"
 	"${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/stm32"
 	"${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/mbedtls"
-	"${CMAKE_CURRENT_SOURCE_DIR}/btl/mcuboot"
+	"${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/mcuboot"
 )
 set(ZEPHYR_BASE "${CMAKE_CURRENT_SOURCE_DIR}/rtos/zephyr")
 
@@ -18,7 +18,7 @@ include(ExternalProject)
 ExternalProject_Add(
 	btl
 	PREFIX btl
-	SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/btl/mcuboot/boot/zephyr"
+	SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/mcuboot/boot/zephyr"
 	BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/btl"
 	INSTALL_COMMAND ""
 	LIST_SEPARATOR ","
diff --git a/fw/btl/mcuboot b/fw/btl/mcuboot
deleted file mode 160000
index 346f737..0000000
--- a/fw/btl/mcuboot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 346f7374ff4467e40b5594658f8ac67a5e9813c9
diff --git a/fw/rtos/modules/mcuboot b/fw/rtos/modules/mcuboot
new file mode 160000
index 0000000..346f737
--- /dev/null
+++ b/fw/rtos/modules/mcuboot
@@ -0,0 +1 @@
+Subproject commit 346f7374ff4467e40b5594658f8ac67a5e9813c9
-- 
cgit v1.2.3-70-g09d2