diff --git a/NOTICE.md b/NOTICE.md index 066e2e7fc01..ca162642261 100644 --- 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/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/LICENSE b/libs/3rdparty/cmsis/LICENSE similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/LICENSE rename to libs/3rdparty/cmsis/LICENSE diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_clang.h b/libs/3rdparty/cmsis/cmsis_clang.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_clang.h rename to libs/3rdparty/cmsis/cmsis_clang.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_compiler.h b/libs/3rdparty/cmsis/cmsis_compiler.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_compiler.h rename to libs/3rdparty/cmsis/cmsis_compiler.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_gcc.h b/libs/3rdparty/cmsis/cmsis_gcc.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_gcc.h rename to libs/3rdparty/cmsis/cmsis_gcc.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_version.h b/libs/3rdparty/cmsis/cmsis_version.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/cmsis_version.h rename to libs/3rdparty/cmsis/cmsis_version.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/core_cm4.h b/libs/3rdparty/cmsis/core_cm4.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/core_cm4.h rename to libs/3rdparty/cmsis/core_cm4.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/m-profile/armv7m_mpu.h b/libs/3rdparty/cmsis/m-profile/armv7m_mpu.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/m-profile/armv7m_mpu.h rename to libs/3rdparty/cmsis/m-profile/armv7m_mpu.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/m-profile/cmsis_clang_m.h b/libs/3rdparty/cmsis/m-profile/cmsis_clang_m.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/m-profile/cmsis_clang_m.h rename to libs/3rdparty/cmsis/m-profile/cmsis_clang_m.h diff --git a/platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/m-profile/cmsis_gcc_m.h b/libs/3rdparty/cmsis/m-profile/cmsis_gcc_m.h similarity index 100% rename from platforms/s32k1xx/bsp/bspMcu/include/3rdparty/cmsis/m-profile/cmsis_gcc_m.h rename to libs/3rdparty/cmsis/m-profile/cmsis_gcc_m.h diff --git a/libs/3rdparty/cmsis/module.spec b/libs/3rdparty/cmsis/module.spec new file mode 100644 index 00000000000..7522f6a7307 --- /dev/null +++ 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 index a44689f5500..ff00638448f 100644 --- 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 index 3f52f1ad78f..a56c0dd84bb 100644 --- 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 index 88e008c6815..ba7cb1d05ef 100644 --- 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