Skip to content

Commit 85dbbac

Browse files
JohnK1987Jan Kamidramultiplemonomials
authored
Update of CMSIS and CMSIS-RTX to latest release and newlly as submodules (#524)
* Delete old CMSIS5 * add cmsis like a submodule * add cmsis-rtx like submodule * New CMSIS strucure * Families specific compilation fixes * Update for submodule_management * Fix submodule_management * Fix wrong subs * different approach * Debug: echo git commands * Try to improve git safe dir logic * Find git also * OK let's try a different way * Ah yes of course, "NOT EQUAL" is not a thing :/ * Replace ACTRL with ACTLR in r_cache_l1_rza2m_asm.h * cleanup cmsis_core.cmake Refactor CMSIS path references in cmake file Message call for debug was removed * Lets try all in one * include fix * correction of including mbed_submodule_management * lets try this * We need still need it * opps --------- Co-authored-by: Jan Kamidra <odiin@windowslive.com> Co-authored-by: Jamie Smith <jsmith@crackofdawn.onmicrosoft.com>
1 parent 3e14eb5 commit 85dbbac

File tree

177 files changed

+593
-69611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+593
-69611
lines changed

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
[submodule "doxygen-awesome-css"]
22
path = tools/doxygen-awesome-css
33
url = https://github.com/jothepro/doxygen-awesome-css.git
4+
[submodule "cmsis/CMSIS_6"]
5+
path = cmsis/CMSIS_6
6+
url = https://github.com/ARM-software/CMSIS_6.git
7+
[submodule "cmsis/CMSIS-RTX"]
8+
path = cmsis/CMSIS-RTX
9+
url = https://github.com/ARM-software/CMSIS-RTX.git
410
[submodule "targets/TARGET_STM/TARGET_STM32U0/STM32Cube_FW/stm32u0xx-hal-driver"]
511
path = targets/TARGET_STM/TARGET_STM32U0/STM32Cube_FW/stm32u0xx-hal-driver
612
url = https://github.com/STMicroelectronics/stm32u0xx-hal-driver.git

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ if(MBED_IS_NATIVE_BUILD)
7070
# Pick up some include files that are needed later
7171
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/tools/cmake)
7272
include(mbed_create_distro)
73+
include(mbed_submodule_management)
7374
else()
7475
include(mbed_set_linker_script)
7576
endif()
@@ -295,8 +296,6 @@ add_subdirectory(connectivity)
295296
# The directories below contain optional target libraries
296297
add_subdirectory(drivers/device_key EXCLUDE_FROM_ALL)
297298
add_subdirectory(features EXCLUDE_FROM_ALL)
298-
add_subdirectory(cmsis/CMSIS_5/CMSIS/RTOS2 EXCLUDE_FROM_ALL)
299-
add_subdirectory(cmsis/device/rtos EXCLUDE_FROM_ALL)
300299

301300
# Create top-level targets ----------------------------------------------------------------------------------
302301

cmsis/CMSIS-RTX

Submodule CMSIS-RTX added at ad98f97

cmsis/CMSIS_5/CMSIS/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

cmsis/CMSIS_5/CMSIS/RTOS2/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)