diff options
| author | hathach <[email protected]> | 2021-03-02 01:18:05 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-03-02 01:18:34 +0700 |
| commit | c34b6b2324809276664070a8c52bfa71ceaf9d06 (patch) | |
| tree | 62c85bfd420fc01e6b173f4a424c1f16d3b9f8dc | |
| parent | 83ce2dfcb73da5e2e59a3232dfb930710d687f2f (diff) | |
remove lib/CMSIS_4 submodule, move nrf to lib/CMSIS_5
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject | 2 | ||||
| -rw-r--r-- | hw/bsp/nrf/family.mk | 2 | ||||
| m--------- | lib/CMSIS_4 | 0 |
4 files changed, 2 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index e33532c4e..209b6ea95 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,6 @@ [submodule "lib/lwip"] path = lib/lwip url = https://github.com/lwip-tcpip/lwip.git -[submodule "lib/CMSIS_4"] - path = lib/CMSIS_4 - url = https://github.com/ARM-software/CMSIS.git [submodule "hw/mcu/st/cmsis_device_f4"] path = hw/mcu/st/cmsis_device_f4 url = https://github.com/STMicroelectronics/cmsis_device_f4.git @@ -113,7 +110,6 @@ path = hw/mcu/raspberrypi/pico-sdk url = https://github.com/raspberrypi/pico-sdk.git fetchRecurseSubmodules = false - [submodule "lib/FreeRTOS-Kernel"] path = lib/FreeRTOS-Kernel url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git diff --git a/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject index f7714f269..944199138 100644 --- a/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject +++ b/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject @@ -21,7 +21,7 @@ build_treat_warnings_as_errors="Yes" c_additional_options="-Wno-error=undef;-Wno-error=unused-parameter;-Wno-error=cast-align;-Wno-error=cast-function-type" c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;CFG_TUSB_MCU=OPT_MCU_NRF5X;CFG_TUSB_DEBUG=1" - c_user_include_directories="../../src;$(rootDir)/lib/CMSIS_4/CMSIS/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src" + c_user_include_directories="../../src;$(rootDir)/lib/CMSIS_5/CMSIS/Core/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src" debug_register_definition_file="nrf52840_Registers.xml" debug_target_connection="J-Link" gcc_enable_all_warnings="Yes" diff --git a/hw/bsp/nrf/family.mk b/hw/bsp/nrf/family.mk index 16c912dc4..4c9e36ed0 100644 --- a/hw/bsp/nrf/family.mk +++ b/hw/bsp/nrf/family.mk @@ -40,7 +40,7 @@ SRC_C += \ INC += \ $(TOP)/$(BOARD_PATH) \ - $(TOP)/lib/CMSIS_4/CMSIS/Include \ + $(TOP)/lib/CMSIS_5/CMSIS/Core/Include \ $(TOP)/hw/mcu/nordic \ $(TOP)/hw/mcu/nordic/nrfx \ $(TOP)/hw/mcu/nordic/nrfx/mdk \ diff --git a/lib/CMSIS_4 b/lib/CMSIS_4 deleted file mode 160000 -Subproject f2cad4345783c948ed4a7f5cdb02cdc0856366f |