diff options
| author | xengineering <me@xengineering.eu> | 2025-03-22 21:53:20 +0100 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2025-03-22 22:30:46 +0100 |
| commit | e4d826addcf7941c79418a674a3b362a035f1bef (patch) | |
| tree | f33eac42e1484a8a2edd5767475ac2a6726ac5e7 | |
| parent | 62be0c0585b147686ad3a41fdce181c8a7e95cd1 (diff) | |
| download | iot-contact-e4d826addcf7941c79418a674a3b362a035f1bef.tar iot-contact-e4d826addcf7941c79418a674a3b362a035f1bef.tar.zst iot-contact-e4d826addcf7941c79418a674a3b362a035f1bef.zip | |
fw: rtos: Restructure RTOS-related code
This reduces nesting and makes the directory structure simpler.
| -rw-r--r-- | .gitmodules | 8 | ||||
| -rw-r--r-- | fw/CMakeLists.txt | 8 | ||||
| m--------- | fw/rtos/modules/cmsis (renamed from fw/zephyrproject/modules/hal/cmsis) | 0 | ||||
| m--------- | fw/rtos/modules/mbedtls (renamed from fw/zephyrproject/modules/crypto/mbedtls) | 0 | ||||
| m--------- | fw/rtos/modules/stm32 (renamed from fw/zephyrproject/modules/hal/stm32) | 0 | ||||
| m--------- | fw/rtos/zephyr (renamed from fw/zephyrproject/zephyr) | 0 |
6 files changed, 8 insertions, 8 deletions
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/zephyrproject/modules/hal/cmsis b/fw/rtos/modules/cmsis -Subproject d1b8b20b6278615b00e136374540eb1c00dcabe +Subproject d1b8b20b6278615b00e136374540eb1c00dcabe diff --git a/fw/zephyrproject/modules/crypto/mbedtls b/fw/rtos/modules/mbedtls -Subproject 4952e1328529ee549d412b498ea71c54f30aa3b +Subproject 4952e1328529ee549d412b498ea71c54f30aa3b diff --git a/fw/zephyrproject/modules/hal/stm32 b/fw/rtos/modules/stm32 -Subproject 55043bcc35fffa3b4a8c75a696d932b5020aad0 +Subproject 55043bcc35fffa3b4a8c75a696d932b5020aad0 diff --git a/fw/zephyrproject/zephyr b/fw/rtos/zephyr -Subproject 7823374e872145b5bd018bfe447839eb3604261 +Subproject 7823374e872145b5bd018bfe447839eb3604261 |