mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 05:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove lib/CMSIS_4 submodule, move nrf to lib/CMSIS_5

Browse Source
This commit is contained in:
hathach 2021-03-02 01:18:05 +07:00
parent 83ce2dfcb7
commit c34b6b2324
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -22,9 +22,6 @@
[submodule "lib/lwip"] [submodule "lib/lwip"]
path = lib/lwip path = lib/lwip
url = https://github.com/lwip-tcpip/lwip.git 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"] [submodule "hw/mcu/st/cmsis_device_f4"]
path = hw/mcu/st/cmsis_device_f4 path = hw/mcu/st/cmsis_device_f4
url = https://github.com/STMicroelectronics/cmsis_device_f4.git url = https://github.com/STMicroelectronics/cmsis_device_f4.git
@ -113,7 +110,6 @@
path = hw/mcu/raspberrypi/pico-sdk path = hw/mcu/raspberrypi/pico-sdk
url = https://github.com/raspberrypi/pico-sdk.git url = https://github.com/raspberrypi/pico-sdk.git
fetchRecurseSubmodules = false fetchRecurseSubmodules = false
[submodule "lib/FreeRTOS-Kernel"] [submodule "lib/FreeRTOS-Kernel"]
path = lib/FreeRTOS-Kernel path = lib/FreeRTOS-Kernel
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git

2
examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
View File

@ -21,7 +21,7 @@
build_treat_warnings_as_errors="Yes" 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_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_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_register_definition_file="nrf52840_Registers.xml"
debug_target_connection="J-Link" debug_target_connection="J-Link"
gcc_enable_all_warnings="Yes" gcc_enable_all_warnings="Yes"

2
hw/bsp/nrf/family.mk
View File

@ -40,7 +40,7 @@ SRC_C += \
INC += \ INC += \
$(TOP)/$(BOARD_PATH) \ $(TOP)/$(BOARD_PATH) \
$(TOP)/lib/CMSIS_4/CMSIS/Include \ $(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
$(TOP)/hw/mcu/nordic \ $(TOP)/hw/mcu/nordic \
$(TOP)/hw/mcu/nordic/nrfx \ $(TOP)/hw/mcu/nordic/nrfx \
$(TOP)/hw/mcu/nordic/nrfx/mdk \ $(TOP)/hw/mcu/nordic/nrfx/mdk \

1
lib/CMSIS_4

@ -1 +0,0 @@
Subproject commit f2cad4345783c948ed4a7f5cdb02cdc0856366f1