From 5199ceaa5070e946a05f87755d67118f7bd95ed8 Mon Sep 17 00:00:00 2001 From: rbaron Date: Tue, 7 Nov 2023 18:31:32 +0100 Subject: [PATCH] Update to nRF Connect SDK 2.5 --- .devcontainer/devcontainer.json | 2 +- .github/actions/build/action.yml | 2 +- .../boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts | 4 ++++ .../arm/bparasite_nrf52833/bparasite_nrf52833_defconfig | 2 -- .../boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts | 4 ++++ .../arm/bparasite_nrf52840/bparasite_nrf52840_defconfig | 2 -- code/nrf-connect/samples/ble/prj.conf | 2 -- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f8b020e..1b78822 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "nrf-connect:v2.4", - "image": "nordicplayground/nrfconnect-sdk:v2.4-branch", + "image": "nordicplayground/nrfconnect-sdk:v2.5-branch", "features": { }, "customizations": { diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 56e880c..583bd4a 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -18,7 +18,7 @@ runs: steps: - run: | docker run --rm -v ${GITHUB_WORKSPACE}:/repo \ - nordicplayground/nrfconnect-sdk:v2.4-branch \ + nordicplayground/nrfconnect-sdk:v2.5-branch \ west build \ --build-dir /repo/${{ inputs.sample-dir }}/build \ --pristine \ diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts index 7487715..f22ce6a 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833.dts @@ -56,6 +56,10 @@ }; }; +&uicr { + gpio-as-nreset; +}; + &gpiote { status = "okay"; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig index e9c2d50..f18797f 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/bparasite_nrf52833_defconfig @@ -16,6 +16,4 @@ CONFIG_GPIO=y CONFIG_CONSOLE=y CONFIG_RTT_CONSOLE=y -CONFIG_GPIO_AS_PINRESET=y - CONFIG_PINCTRL=y diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts index 811d8a3..b0da5cb 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840.dts @@ -56,6 +56,10 @@ }; }; +&uicr { + gpio-as-nreset; +}; + &gpiote { status = "okay"; }; diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig index 43a095b..386002b 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/bparasite_nrf52840_defconfig @@ -16,6 +16,4 @@ CONFIG_GPIO=y CONFIG_CONSOLE=y CONFIG_RTT_CONSOLE=y -CONFIG_GPIO_AS_PINRESET=y - CONFIG_PINCTRL=y diff --git a/code/nrf-connect/samples/ble/prj.conf b/code/nrf-connect/samples/ble/prj.conf index 51d475d..b58da14 100644 --- a/code/nrf-connect/samples/ble/prj.conf +++ b/code/nrf-connect/samples/ble/prj.conf @@ -11,8 +11,6 @@ CONFIG_BT_DEVICE_NAME="prst" CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_SERIAL=n -CONFIG_PM=y -CONFIG_PM_DEVICE=y CONFIG_USE_SEGGER_RTT=y