From e4d826addcf7941c79418a674a3b362a035f1bef Mon Sep 17 00:00:00 2001
From: xengineering <me@xengineering.eu>
Date: Sat, 22 Mar 2025 21:53:20 +0100
Subject: fw: rtos: Restructure RTOS-related code

This reduces nesting and makes the directory structure simpler.
---
 .gitmodules                             | 8 ++++----
 fw/CMakeLists.txt                       | 8 ++++----
 fw/rtos/modules/cmsis                   | 1 +
 fw/rtos/modules/mbedtls                 | 1 +
 fw/rtos/modules/stm32                   | 1 +
 fw/rtos/zephyr                          | 1 +
 fw/zephyrproject/modules/crypto/mbedtls | 1 -
 fw/zephyrproject/modules/hal/cmsis      | 1 -
 fw/zephyrproject/modules/hal/stm32      | 1 -
 fw/zephyrproject/zephyr                 | 1 -
 10 files changed, 12 insertions(+), 12 deletions(-)
 create mode 160000 fw/rtos/modules/cmsis
 create mode 160000 fw/rtos/modules/mbedtls
 create mode 160000 fw/rtos/modules/stm32
 create mode 160000 fw/rtos/zephyr
 delete mode 160000 fw/zephyrproject/modules/crypto/mbedtls
 delete mode 160000 fw/zephyrproject/modules/hal/cmsis
 delete mode 160000 fw/zephyrproject/modules/hal/stm32
 delete mode 160000 fw/zephyrproject/zephyr

diff --git a/.gitmodules b/.gitmodules
index f12e67b..efc84df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,14 +1,14 @@
 [submodule "firmware/zephyrproject/zephyr"]
-	path = fw/zephyrproject/zephyr
+	path = fw/rtos/zephyr
 	url = https://github.com/zephyrproject-rtos/zephyr.git
 [submodule "zephyrproject/modules/hal/stm32"]
-	path = fw/zephyrproject/modules/hal/stm32
+	path = fw/rtos/modules/stm32
 	url = https://github.com/zephyrproject-rtos/hal_stm32.git
 [submodule "zephyrproject/modules/hal/cmsis"]
-	path = fw/zephyrproject/modules/hal/cmsis
+	path = fw/rtos/modules/cmsis
 	url = https://github.com/zephyrproject-rtos/cmsis.git
 [submodule "fw/zephyrproject/modules/crypto/mbedtls"]
-	path = fw/zephyrproject/modules/crypto/mbedtls
+	path = fw/rtos/modules/mbedtls
 	url = https://github.com/zephyrproject-rtos/mbedtls.git
 [submodule "fw/zephyrproject/bootloader/mcuboot"]
 	path = fw/btl/mcuboot
diff --git a/fw/CMakeLists.txt b/fw/CMakeLists.txt
index 6be1c21..ce16b10 100644
--- a/fw/CMakeLists.txt
+++ b/fw/CMakeLists.txt
@@ -6,9 +6,9 @@ cmake_minimum_required(VERSION 3.20.0)
 
 set(BOARD "native_sim/native/64")
 set(ZEPHYR_MODULES
-	"${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/modules/hal/cmsis"
-	"${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/modules/hal/stm32"
-	"${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/modules/crypto/mbedtls"
+	"${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"
 )
 
@@ -31,7 +31,7 @@ ExternalProject_Add(
 find_package(Zephyr
 	REQUIRED
 	HINTS
-		"${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/zephyr"
+		"${CMAKE_CURRENT_SOURCE_DIR}/rtos/zephyr"
 )
 
 project(iot-contact-fw)
diff --git a/fw/rtos/modules/cmsis b/fw/rtos/modules/cmsis
new file mode 160000
index 0000000..d1b8b20
--- /dev/null
+++ b/fw/rtos/modules/cmsis
@@ -0,0 +1 @@
+Subproject commit d1b8b20b6278615b00e136374540eb1c00dcabe7
diff --git a/fw/rtos/modules/mbedtls b/fw/rtos/modules/mbedtls
new file mode 160000
index 0000000..4952e13
--- /dev/null
+++ b/fw/rtos/modules/mbedtls
@@ -0,0 +1 @@
+Subproject commit 4952e1328529ee549d412b498ea71c54f30aa3b1
diff --git a/fw/rtos/modules/stm32 b/fw/rtos/modules/stm32
new file mode 160000
index 0000000..55043bc
--- /dev/null
+++ b/fw/rtos/modules/stm32
@@ -0,0 +1 @@
+Subproject commit 55043bcc35fffa3b4a8c75a696d932b5020aad09
diff --git a/fw/rtos/zephyr b/fw/rtos/zephyr
new file mode 160000
index 0000000..7823374
--- /dev/null
+++ b/fw/rtos/zephyr
@@ -0,0 +1 @@
+Subproject commit 7823374e872145b5bd018bfe447839eb36042611
diff --git a/fw/zephyrproject/modules/crypto/mbedtls b/fw/zephyrproject/modules/crypto/mbedtls
deleted file mode 160000
index 4952e13..0000000
--- a/fw/zephyrproject/modules/crypto/mbedtls
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4952e1328529ee549d412b498ea71c54f30aa3b1
diff --git a/fw/zephyrproject/modules/hal/cmsis b/fw/zephyrproject/modules/hal/cmsis
deleted file mode 160000
index d1b8b20..0000000
--- a/fw/zephyrproject/modules/hal/cmsis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1b8b20b6278615b00e136374540eb1c00dcabe7
diff --git a/fw/zephyrproject/modules/hal/stm32 b/fw/zephyrproject/modules/hal/stm32
deleted file mode 160000
index 55043bc..0000000
--- a/fw/zephyrproject/modules/hal/stm32
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55043bcc35fffa3b4a8c75a696d932b5020aad09
diff --git a/fw/zephyrproject/zephyr b/fw/zephyrproject/zephyr
deleted file mode 160000
index 7823374..0000000
--- a/fw/zephyrproject/zephyr
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7823374e872145b5bd018bfe447839eb36042611
-- 
cgit v1.2.3-70-g09d2