diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | contrib/Makefile | 18 | ||||
-rw-r--r-- | defines.mk | 3 | ||||
-rw-r--r-- | sdk.mk | 2 |
4 files changed, 21 insertions, 4 deletions
@@ -1,5 +1,7 @@ /contrib/pico-sdk-*/ /contrib/pico-sdk-*.tar.gz +/contrib/tinyusb-*/ +/contrib/tinyusb-*.tar.gz /contrib/picoprobe.u2f /contrib/flash_nuke.u2f /contrib/openocd diff --git a/contrib/Makefile b/contrib/Makefile index 4b3285f..b4cc0de 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -22,6 +22,8 @@ SDK_VERSION := 1.4.0 SDK_SHA256SUM := 951d1d316d9a01c734c5ec53e766a2d03fb44f405a2494bac9a8a7c178e25918 +TINYUSB_VERSION := 0.14.0 +TINYUSB_SHA256SUM := bc91c41672aa075e921ee742595b0ee5410722ef9e4644ed45519311de78cc87 CHIBIOS_VERSION := 21.11.2 CHIBIOS_SHA256SUM := ba74eec6230b66d79c0f0a26e9af00ca46756cb47f7b4a229eb228cbff3a8b48 FMPP_VERSION := 0.9.16 @@ -36,8 +38,8 @@ GCC_SHA256SUM := 5adc2ee03904571c2de79d5cfc0f7fe2a5c5f54f44da5b645c17ee57b217f11 # GCC_SHA256SUM := 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3 -all: download-sdk download-picoprobe download-flash_nuke clone-openocd download-chibios download-gcc -clean: clean-sdk clean-picoprobe clean-flash_nuke clean-openocd clean-chibios clean-gcc +all: download-sdk download-tinyusb download-picoprobe download-flash_nuke clone-openocd download-chibios download-gcc +clean: clean-sdk clean-tinyusb clean-picoprobe clean-flash_nuke clean-openocd clean-chibios clean-gcc @@ -54,6 +56,18 @@ clean-sdk: rm -rf pico-sdk-${SDK_VERSION} +download-tinyusb: tinyusb-${TINYUSB_VERSION}.tar.gz + +tinyusb-${TINYUSB_VERSION}.tar.gz: + wget "https://github.com/hathach/tinyusb/archive/refs/tags/${TINYUSB_VERSION}.tar.gz" -O "$@" + echo "${TINYUSB_SHA256SUM} $@" | sha256sum -c + tar -xzf $@ + +clean-tinyusb: + rm -f tinyusb-${TINYUSB_VERSION}.tar.gz + rm -rf tinyusb-${TINYUSB_VERSION} + + download-picoprobe: picoprobe.u2f picoprobe.u2f: @@ -25,6 +25,7 @@ SPREADRPPICO_PATH := .. endif TOOLCHAIN_PATH := $(SPREADRPPICO_PATH)/contrib/gcc-arm-none-eabi-9-2020-q2-update/bin -CHIBIOS := ../contrib/ChibiOS_21.11.2 +CHIBIOS := $(SPREADRPPICO_PATH)/contrib/ChibiOS_21.11.2 CHIBIOS_CONTRIB := $(CHIBIOS)/community OPENOCD := $(SPREADRPPICO_PATH)/contrib/openocd +TINYUSB_PATH := $(SPREADRPPICO_PATH)/contrib/tinyusb-0.14.0 @@ -25,7 +25,7 @@ all: build build/Makefile: mkdir -p build - cd build; cmake -D PICO_PLATFORM=${PICO_PLATFORM} -D PICO_BOARD=${PICO_BOARD} -D PICO_COMPILER=pico_arm_gcc -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} .. + cd build; cmake -D PICO_PLATFORM=${PICO_PLATFORM} -D PICO_BOARD=${PICO_BOARD} -D PICO_COMPILER=pico_arm_gcc -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -D PICO_TINYUSB_PATH=$(realpath ${TINYUSB_PATH}) .. build: build/Makefile make -C build |