eclipse-openbsw · nhuvaoanh123 · Apr 22, 2026 · May 1, 2026
diff --git a/NOTICE.md b/NOTICE.md
@@ -45,7 +45,7 @@ We recommend to read their licenses, as their terms may differ from the terms de
 | ThreadX Kernel            | 6.4.3   | MIT       | ``libs/3rdparty/threadx/LICENSE.md``                                 |
 | ThreadX Cortex M4 Port    | 6.4.3   | MIT       | ``platforms/s32k1xx/3rdparty/threadx/LICENSE.md``                    |
 | ThreadX Linux Port        | 6.4.3   | MIT       | ``platforms/posix/3rdparty/threadx/LICENSE.md``                      |
-| CMSIS                     | 6.1.0   | Apache v2 | ``platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/LICENSE``      |
+| CMSIS                     | 6.1.0   | Apache v2 | ``libs/3rdparty/cmsis/LICENSE``                                      |
 | NXP S32K148 Headers       | 1.1a    | BSD-3     | ``platforms/s32k1xx/bsp/bspMcu/include/3rdparty/nxp/*.h``            |
 | CodeCoverage              |         | BSD-3     | ``cmake/modules/CodeCoverage.cmake``                                 |
 

diff --git a/...bsp/bspMcu/include/3rdparty/cmsis/LICENSE → libs/3rdparty/cmsis/LICENSE b/...bsp/bspMcu/include/3rdparty/cmsis/LICENSE → libs/3rdparty/cmsis/LICENSE
diff --git a/...pMcu/include/3rdparty/cmsis/cmsis_clang.h → libs/3rdparty/cmsis/cmsis_clang.h b/...pMcu/include/3rdparty/cmsis/cmsis_clang.h → libs/3rdparty/cmsis/cmsis_clang.h
diff --git a/...u/include/3rdparty/cmsis/cmsis_compiler.h → libs/3rdparty/cmsis/cmsis_compiler.h b/...u/include/3rdparty/cmsis/cmsis_compiler.h → libs/3rdparty/cmsis/cmsis_compiler.h
diff --git a/...bspMcu/include/3rdparty/cmsis/cmsis_gcc.h → libs/3rdparty/cmsis/cmsis_gcc.h b/...bspMcu/include/3rdparty/cmsis/cmsis_gcc.h → libs/3rdparty/cmsis/cmsis_gcc.h
diff --git a/...cu/include/3rdparty/cmsis/cmsis_version.h → libs/3rdparty/cmsis/cmsis_version.h b/...cu/include/3rdparty/cmsis/cmsis_version.h → libs/3rdparty/cmsis/cmsis_version.h
diff --git a/.../bspMcu/include/3rdparty/cmsis/core_cm4.h → libs/3rdparty/cmsis/core_cm4.h b/.../bspMcu/include/3rdparty/cmsis/core_cm4.h → libs/3rdparty/cmsis/core_cm4.h
diff --git a/...ude/3rdparty/cmsis/m-profile/armv7m_mpu.h → libs/3rdparty/cmsis/m-profile/armv7m_mpu.h b/...ude/3rdparty/cmsis/m-profile/armv7m_mpu.h → libs/3rdparty/cmsis/m-profile/armv7m_mpu.h
diff --git a/.../3rdparty/cmsis/m-profile/cmsis_clang_m.h → .../3rdparty/cmsis/m-profile/cmsis_clang_m.h b/.../3rdparty/cmsis/m-profile/cmsis_clang_m.h → .../3rdparty/cmsis/m-profile/cmsis_clang_m.h
diff --git a/...de/3rdparty/cmsis/m-profile/cmsis_gcc_m.h → libs/3rdparty/cmsis/m-profile/cmsis_gcc_m.h b/...de/3rdparty/cmsis/m-profile/cmsis_gcc_m.h → libs/3rdparty/cmsis/m-profile/cmsis_gcc_m.h
diff --git a/libs/3rdparty/cmsis/module.spec b/libs/3rdparty/cmsis/module.spec
@@ -0,0 +1,3 @@
+unit_test: false
+format_check: false
+oss: true
diff --git a/platforms/s32k1xx/bsp/bspMcu/CMakeLists.txt b/platforms/s32k1xx/bsp/bspMcu/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_library(bspMcu src/reset/softwareSystemReset.cpp)
 
-target_include_directories(bspMcu PUBLIC include)
+target_include_directories(
+    bspMcu PUBLIC include ${CMAKE_SOURCE_DIR}/libs/3rdparty/cmsis
+                  ${CMAKE_SOURCE_DIR}/libs/3rdparty/cmsis/m-profile)
 
 target_link_libraries(bspMcu PUBLIC platform)
diff --git a/platforms/s32k1xx/bsp/bspMcu/include/mcu/mcu.h b/platforms/s32k1xx/bsp/bspMcu/include/mcu/mcu.h
@@ -7,7 +7,7 @@
 // NXP has their own MPU, so we must not use the cmsis one.
 #undef __MPU_PRESENT
 #define INCLUDE_CORE_CM4_IN_MCU_H
-#include "3rdparty/cmsis/core_cm4.h"
+#include "core_cm4.h"
 #undef INCLUDE_CORE_CM4_IN_MCU_H
 #define __MPU_PRESENT 1
 #else

diff --git a/platforms/s32k1xx/bsp/bspMcu/module.spec b/platforms/s32k1xx/bsp/bspMcu/module.spec
@@ -2,9 +2,7 @@ maturity: raw
 unit_test: false
 format_check_exclude:
   - "include/3rdparty/nxp/*.h"
-  - "include/3rdparty/cmsis/**/*.h"
 sca_exclude:
   '*':
     - 'include/3rdparty/nxp/*.h'
-    - 'include/3rdparty/cmsis/**/*.h'
 oss: true