From 2a2443d5907bdc9f3cafaa4a20b004c22b7f670d Mon Sep 17 00:00:00 2001
From: smittytone <tsmith@korewireless.com>
Date: Thu, 2 Nov 2023 12:10:23 +0000
Subject: [PATCH] Support new HAL repo

---
 .gitmodules            |  3 +++
 CMakeLists.txt         | 10 ++++------
 Microvisor-HAL-STM32U5 |  1 +
 README.md              |  2 +-
 app/CMakeLists.txt     |  4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 160000 Microvisor-HAL-STM32U5

diff --git a/.gitmodules b/.gitmodules
index 9ddfc2b..6600e32 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eff340..9719bbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
@@ -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
 )
@@ -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
 )
 
diff --git a/Microvisor-HAL-STM32U5 b/Microvisor-HAL-STM32U5
new file mode 160000
index 0000000..515f74c
--- /dev/null
+++ b/Microvisor-HAL-STM32U5
@@ -0,0 +1 @@
+Subproject commit 515f74ce7658595ffac8306668c3aff5e1ef084c
diff --git a/README.md b/README.md
index 1449306..2d500c8 100644
--- a/README.md
+++ b/README.md
@@ -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).
 
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index bc4d8df..88e07ad 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -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}")
@@ -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
 )