Skip to content

Commit

Permalink
Support new HAL repo
Browse files Browse the repository at this point in the history
  • Loading branch information
smittytone committed Nov 2, 2023
1 parent c983168 commit 2a2443d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "FreeRTOS-Kernel"]
path = FreeRTOS-Kernel
url = https://github.com/FreeRTOS/FreeRTOS-Kernel
[submodule "Microvisor-HAL-STM32U5"]
path = Microvisor-HAL-STM32U5
url = https://github.com/korewireless/Microvisor-HAL-STM32U5.git
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/toolchain.cmake")

project(${PROJECT_NAME} C CXX ASM)

include_directories(include
${twilio-microvisor-hal-stm32u5_INCLUDE_DIRS})

set(INCLUDED_HAL_FILES
Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal.c
Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cortex.c
Expand All @@ -47,11 +44,12 @@ set(INCLUDED_HAL_FILES
)

# Load the HAL
add_subdirectory(twilio-microvisor-hal-stm32u5)
add_subdirectory(Microvisor-HAL-STM32U5)

# Build the STM32 middleware
add_library(ST_Code STATIC
ST_Code/Core/Src/syscalls.c ST_Code/Core/Src/sysmem.c
ST_Code/Core/Src/syscalls.c
ST_Code/Core/Src/sysmem.c
ST_Code/Core/Src/stm32u5xx_hal_msp.c
ST_Code/CMSIS_RTOS_V2/cmsis_os2.c
)
Expand All @@ -62,7 +60,7 @@ target_include_directories(ST_Code PUBLIC
)

target_link_libraries(ST_Code LINK_PUBLIC
twilio-microvisor-hal-stm32u5
Microvisor-HAL-STM32U5
FreeRTOS
)

Expand Down
1 change: 1 addition & 0 deletions Microvisor-HAL-STM32U5
Submodule Microvisor-HAL-STM32U5 added at 515f74
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ You will need to pass the path to the private key to the Twilio CLI Microvisor p

The sample code and Microvisor SDK is © 2023, KORE Wireless. It is licensed under the terms of the [MIT](./LICENSE.md).

The SDK makes used of code © 2021, STMicroelectronics and affiliates. This code is licensed under terms described in [this file](https://github.com/twilio/twilio-microvisor-hal-stm32u5/blob/main/LICENSE-STM32CubeU5.md).
The SDK makes used of code © 2021, STMicroelectronics and affiliates. This code is licensed under terms described in [this file](https://github.com/korewireless/Microvisor-HAL-STM32U5/blob/main/LICENSE-STM32CubeU5.md).

The SDK makes use [ARM CMSIS](https://github.com/ARM-software/CMSIS_5) © 2004, ARM. It is licensed under the terms of the [Apache 2.0 License](./LICENSE).

Expand Down
4 changes: 2 additions & 2 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)

# Set application data
set(APP "Microvisor HTTP Demo")
set(VERSION_NUMBER "3.1.1")
set(VERSION_NUMBER "3.1.2")
set(BUILD_NUMBER "1")

message("Building ${APP} ${VERSION_NUMBER} build ${BUILD_NUMBER}")
Expand All @@ -25,7 +25,7 @@ add_executable(${PROJECT_NAME}
# Link built libraries
target_link_libraries(${PROJECT_NAME} LINK_PUBLIC
ST_Code
twilio-microvisor-hal-stm32u5
Microvisor-HAL-STM32U5
FreeRTOS
)

Expand Down

0 comments on commit 2a2443d

Please sign in to comment.