diff --git a/.gitmodules b/.gitmodules index 382d9d92ec..28e429129c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -177,7 +177,7 @@ url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath [submodule "ports/raspberrypi/sdk"] path = ports/raspberrypi/sdk - url = https://github.com/adafruit/pico-sdk.git + url = https://github.com/raspberrypi/pico-sdk.git [submodule "data/nvm.toml"] path = data/nvm.toml url = https://github.com/adafruit/nvm.toml.git diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile index ac13a061b7..967bd67078 100644 --- a/ports/raspberrypi/Makefile +++ b/ports/raspberrypi/Makefile @@ -76,6 +76,7 @@ INC += -I. \ -isystem sdk/src/rp2_common/hardware_base/include/ \ -isystem sdk/src/rp2_common/hardware_claim/include/ \ -isystem sdk/src/rp2_common/hardware_clocks/include/ \ + -isystem sdk/src/rp2_common/hardware_divider/include/ \ -isystem sdk/src/rp2_common/hardware_dma/include/ \ -isystem sdk/src/rp2_common/hardware_flash/include/ \ -isystem sdk/src/rp2_common/hardware_gpio/include/ \ diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk index 49c0c1613d..bfcbefafc5 160000 --- a/ports/raspberrypi/sdk +++ b/ports/raspberrypi/sdk @@ -1 +1 @@ -Subproject commit 49c0c1613dca37eea85f168290e858cca4411d81 +Subproject commit bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7 diff --git a/ports/raspberrypi/sdk_config/pico/config_autogen.h b/ports/raspberrypi/sdk_config/pico/config_autogen.h index 688f367c34..a8ff324e1c 100644 --- a/ports/raspberrypi/sdk_config/pico/config_autogen.h +++ b/ports/raspberrypi/sdk_config/pico/config_autogen.h @@ -1,19 +1,22 @@ #pragma once -#define PICO_IE_26_29_UNCHANGED_ON_RESET (0) -#define PICO_USE_STACK_GUARDS (0) +// alphabetized +#define LIB_PICO_BINARY_INFO (0) +#define LIB_PICO_PRINTF_NONE (0) +#define LIB_PICO_PRINTF_PICO (0) +#define LIB_PICO_STDIO_SEMIHOSTING (0) +#define LIB_PICO_STDIO_UART (0) +#define LIB_PICO_STDIO_USB (0) +#define PICO_DIVIDER_DISABLE_INTERRUPTS (0) +#define PICO_DOUBLE_SUPPORT_ROM_V1 (1) #define PICO_ENTER_USB_BOOT_ON_EXIT (0) -#define PICO_USE_OPTIMISTIC_SBRK (0) +#define PICO_FLOAT_SUPPORT_ROM_V1 (1) +#define PICO_IE_26_29_UNCHANGED_ON_RESET (0) +#define PICO_INT64_OPS_IN_RAM (0) #define PICO_NO_HARDWARE (0) #define PICO_ON_DEVICE (1) -#define PICO_USE_CRT_PRINTF (0) -#define PICO_NO_PRINTF (0) -#define PICO_FLOAT_SUPPORT_ROM_V1 (1) -#define PICO_DOUBLE_SUPPORT_ROM_V1 (1) -#define PICO_STDIO_UART (0) -#define PICO_STDIO_USB (0) -#define PICO_STDIO_SEMIHOSTING (0) -#define PICO_STDIO_IGNORE_NESTED_STDOUT (0) -#define PICO_PRINTF_PICO (0) -#define PICO_PRINTF_NONE (0) #define PICO_PRINTF_ALWAYS_INCLUDED (1) +#define PICO_STDIO_IGNORE_NESTED_STDOUT (0) +#define PICO_USE_CRT_PRINTF (0) +#define PICO_USE_OPTIMISTIC_SBRK (0) +#define PICO_USE_STACK_GUARDS (0) diff --git a/ports/raspberrypi/sdk_config/pico/version.h b/ports/raspberrypi/sdk_config/pico/version.h index 3a1e1a3d27..6afc48bd4f 100644 --- a/ports/raspberrypi/sdk_config/pico/version.h +++ b/ports/raspberrypi/sdk_config/pico/version.h @@ -12,8 +12,8 @@ #define _PICO_VERSION_H #define PICO_SDK_VERSION_MAJOR 1 -#define PICO_SDK_VERSION_MINOR 0 +#define PICO_SDK_VERSION_MINOR 2 #define PICO_SDK_VERSION_REVISION 0 -#define PICO_SDK_VERSION_STRING "1.0.0" +#define PICO_SDK_VERSION_STRING "1.2.0" #endif