summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <thach@tinyusb.org>2018-07-10 01:02:33 +0700
committerhathach <thach@tinyusb.org>2018-07-10 01:02:33 +0700
commitc5089d7274fe3518cc2bd41874120d33c8fc7079 (patch)
tree05ffffe69edfba17e824ba17d856034ff36db870
parentbaf68a936e111d76c4e00294dfed12287b8e0a76 (diff)
generate uf2 by default
update tusb
m---------lib/tinyusb0
-rw-r--r--ports/nrf/Makefile4
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tinyusb b/lib/tinyusb
-Subproject 40de723d417e253e3346b58cd2ce8b5dbf60d0a
+Subproject 5d8cf5cf8fc30cb8fbb7553b0f949d8f3298c60
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index b2b837eb5..11f6bb153 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -249,7 +249,7 @@ $(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
.phony: all flash sd binary hex bootloader
-all: binary hex
+all: binary hex uf2
OUTPUT_FILENAME = firmware
@@ -305,7 +305,7 @@ endif
#####################
# Flash with DFU
#####################
-.phony: dfu-gen dfu-flash dfu-bootloader uf2
+.phony: dfu-gen dfu-flash dfu-bootloader
ifeq ($(OS),Windows_NT)
NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe