From c5089d7274fe3518cc2bd41874120d33c8fc7079 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 10 Jul 2018 01:02:33 +0700 Subject: [PATCH] generate uf2 by default update tusb --- lib/tinyusb | 2 +- ports/nrf/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tinyusb b/lib/tinyusb index 40de723d41..5d8cf5cf8f 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 40de723d417e253e3346b58cd2ce8b5dbf60d0ac +Subproject commit 5d8cf5cf8fc30cb8fbb7553b0f949d8f3298c602 diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index b2b837eb51..11f6bb153d 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