From 42126a39b96817fed111a9ec271688681382f4b0 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sun, 23 Mar 2025 18:38:04 +0100 Subject: fw: rtos: modules: Rename to hal_stm32 This submodule is called `hal_stm32` upstream. Thus the submodule directory should here be called exactly the same to reduce confusion compared to `stm32`. --- .gitmodules | 2 +- fw/CMakeLists.txt | 2 +- fw/rtos/modules/hal_stm32 | 1 + fw/rtos/modules/stm32 | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) create mode 160000 fw/rtos/modules/hal_stm32 delete mode 160000 fw/rtos/modules/stm32 diff --git a/.gitmodules b/.gitmodules index 2e70fd7..755d4f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = fw/rtos/zephyr url = https://github.com/zephyrproject-rtos/zephyr.git [submodule "zephyrproject/modules/hal/stm32"] - path = fw/rtos/modules/stm32 + path = fw/rtos/modules/hal_stm32 url = https://github.com/zephyrproject-rtos/hal_stm32.git [submodule "zephyrproject/modules/hal/cmsis"] path = fw/rtos/modules/cmsis diff --git a/fw/CMakeLists.txt b/fw/CMakeLists.txt index e2c649e..0eca50f 100644 --- a/fw/CMakeLists.txt +++ b/fw/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.20.0) set(BOARD "native_sim/native/64") set(ZEPHYR_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/cmsis" - "${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/stm32" + "${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/hal_stm32" "${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/mbedtls" "${CMAKE_CURRENT_SOURCE_DIR}/rtos/modules/mcuboot" ) diff --git a/fw/rtos/modules/hal_stm32 b/fw/rtos/modules/hal_stm32 new file mode 160000 index 0000000..55043bc --- /dev/null +++ b/fw/rtos/modules/hal_stm32 @@ -0,0 +1 @@ +Subproject commit 55043bcc35fffa3b4a8c75a696d932b5020aad09 diff --git a/fw/rtos/modules/stm32 b/fw/rtos/modules/stm32 deleted file mode 160000 index 55043bc..0000000 --- a/fw/rtos/modules/stm32 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 55043bcc35fffa3b4a8c75a696d932b5020aad09 -- cgit v1.2.3-70-g09d2