summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <thach@tinyusb.org>2021-03-10 18:58:23 +0700
committerhathach <thach@tinyusb.org>2021-03-10 18:58:23 +0700
commitd1c6bb092722867c7581022d993486a6ef2ae4c6 (patch)
treef7005a558954d33deed769ca16a16e74bb60b369
parent3b46f2c8789bff420ed37c6a0037e39bbbd41df6 (diff)
rp2040 add double reset to uf2, also update pico-sdk to 1.1.0
-rw-r--r--ports/raspberrypi/Makefile3
m---------ports/raspberrypi/sdk0
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
index ffd50299f..bd1cee85c 100644
--- a/ports/raspberrypi/Makefile
+++ b/ports/raspberrypi/Makefile
@@ -107,7 +107,7 @@ INC += -I. \
# Pico specific configuration
CFLAGS += -DPICO_ON_DEVICE=1 -DPICO_NO_BINARY_INFO=0 -DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1 -DPICO_DIVIDER_CALL_IDIV0=0 -DPICO_DIVIDER_CALL_LDIV0=0 -DPICO_DIVIDER_HARDWARE=1 -DPICO_DOUBLE_ROM=1 -DPICO_FLOAT_ROM=1 -DPICO_MULTICORE=1 -DPICO_BITS_IN_RAM=0 -DPICO_DIVIDER_IN_RAM=0 -DPICO_DOUBLE_PROPAGATE_NANS=0 -DPICO_DOUBLE_IN_RAM=0 -DPICO_MEM_IN_RAM=0 -DPICO_FLOAT_IN_RAM=0 -DPICO_FLOAT_PROPAGATE_NANS=1 -DPICO_NO_FLASH=0 -DPICO_COPY_TO_RAM=0 -DPICO_DISABLE_SHARED_IRQ_HANDLERS=0
-OPTIMIZATION_FLAGS ?= -O3
+OPTIMIZATION_FLAGS ?= -O3 -DPICO_NO_BI_BOOTSEL_VIA_DOUBLE_RESET=0
# TinyUSB defines
CFLAGS += -DTUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX=1 -DCFG_TUSB_MCU=OPT_MCU_RP2040 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_CDC_RX_BUFSIZE=256 -DCFG_TUD_MIDI_TX_BUFSIZE=128 -DCFG_TUD_CDC_TX_BUFSIZE=256 -DCFG_TUD_MSC_BUFSIZE=1024
@@ -177,6 +177,7 @@ SRC_SDK := \
src/rp2_common/hardware_watchdog/watchdog.c \
src/rp2_common/hardware_xosc/xosc.c \
src/rp2_common/pico_bootrom/bootrom.c \
+ src/rp2_common/pico_bootsel_via_double_reset/pico_bootsel_via_double_reset.c \
src/rp2_common/pico_double/double_init_rom.c \
src/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c \
src/rp2_common/pico_float/float_init_rom.c \
diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk
-Subproject 55346c953012ef5b32f392fea3b42814db8df2a
+Subproject fc10a97c386f65c1a44c68684fe52a56aaf50df