diff options
| author | xengineering <me@xengineering.eu> | 2025-03-23 18:33:19 +0100 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2025-03-26 21:18:23 +0100 |
| commit | 1fcf9bd0d1af10c57a67d90496b5406244ca25ba (patch) | |
| tree | 2b660699ed6903afb586d45322c82fab84848bc3 | |
| parent | 1eabe70aae439fbc00325d27749d1464320d8a03 (diff) | |
| download | iot-contact-1fcf9bd0d1af10c57a67d90496b5406244ca25ba.tar iot-contact-1fcf9bd0d1af10c57a67d90496b5406244ca25ba.tar.zst iot-contact-1fcf9bd0d1af10c57a67d90496b5406244ca25ba.zip | |
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.
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | fw/CMakeLists.txt | 4 | ||||
| m--------- | fw/rtos/modules/mcuboot (renamed from fw/btl/mcuboot) | 0 |
3 files changed, 3 insertions, 3 deletions
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/rtos/modules/mcuboot -Subproject 346f7374ff4467e40b5594658f8ac67a5e9813c +Subproject 346f7374ff4467e40b5594658f8ac67a5e9813c |