sys64738
/
DragonProbe
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

was advised to directly use CMSIS_5 submodule

This commit is contained in:
Peter Lawrence 2021-02-01 10:25:49 -06:00
parent 3a239c31ba
commit 491e696622
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "tinyusb"] [submodule "tinyusb"]
path = tinyusb path = tinyusb
url = https://github.com/hathach/tinyusb url = https://github.com/hathach/tinyusb
[submodule "CMSIS_5"]
path = CMSIS_5
url = https://github.com/ARM-software/CMSIS_5.git

1
CMSIS_5 Submodule

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

14
CMakeLists.txt
View File

@ -21,18 +21,18 @@ if(FAMILY STREQUAL "rp2040")
target_sources(${PROJECT} PUBLIC target_sources(${PROJECT} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/main.c ${CMAKE_CURRENT_SOURCE_DIR}/main.c
${CMAKE_CURRENT_SOURCE_DIR}/usb_descriptors.c ${CMAKE_CURRENT_SOURCE_DIR}/usb_descriptors.c
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c
) )
# Example include # Example include
target_include_directories(${PROJECT} PUBLIC target_include_directories(${PROJECT} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Include/ ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/DAP/Firmware/Include/
${TOP}/lib/CMSIS_5/CMSIS/Core/Include/ ${CMAKE_CURRENT_SOURCE_DIR}/CMSIS_5/CMSIS/Core/Include/
${CMAKE_CURRENT_SOURCE_DIR}/bsp/${FAMILY}/ ${CMAKE_CURRENT_SOURCE_DIR}/bsp/${FAMILY}/
${CMAKE_CURRENT_SOURCE_DIR}/bsp/default/ ${CMAKE_CURRENT_SOURCE_DIR}/bsp/default/
) )

12
Makefile
View File

@ -3,7 +3,7 @@ include ./tinyusb/examples/make.mk
INC += \ INC += \
. \ . \
$(TOP)/lib/CMSIS_5/CMSIS/DAP/Firmware/Include \ ./CMSIS_5/CMSIS/DAP/Firmware/Include \
./bsp/$(BOARD) \ ./bsp/$(BOARD) \
./bsp/default \ ./bsp/default \
$(TOP)/hw $(TOP)/hw
@ -13,10 +13,10 @@ APP_SOURCE += $(wildcard ./*.c)
SRC_C += $(addprefix $(CURRENT_PATH)/, $(APP_SOURCE)) SRC_C += $(addprefix $(CURRENT_PATH)/, $(APP_SOURCE))
SRC_C += \ SRC_C += \
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c \ ./CMSIS_5/CMSIS/DAP/Firmware/Source/DAP.c \
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c \ ./CMSIS_5/CMSIS/DAP/Firmware/Source/JTAG_DP.c \
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c \ ./CMSIS_5/CMSIS/DAP/Firmware/Source/DAP_vendor.c \
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c \ ./CMSIS_5/CMSIS/DAP/Firmware/Source/SWO.c \
${TOP}/lib/CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c ./CMSIS_5/CMSIS/DAP/Firmware/Source/SW_DP.c
include ./tinyusb/examples/rules.mk include ./tinyusb/examples/rules.mk

2
README.md
View File

@ -6,7 +6,7 @@ Whereas the original code used ST's STM32 USB drivers, this new iteration uses [
## Building ## Building
After initially downloading this project's code, issue the following command to download TinyUSB code and its submodules (including ARM's CMSIS_5): After initially downloading this project's code, issue the following command to download TinyUSB and CMSIS_5 code (as well as all submodules):
``` ```
git submodule update --init --recursive git submodule update --init --recursive