diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision index 94918f5001ceb9..fa795cfddad312 100644 --- a/config/nrfconnect/.nrfconnect-recommended-revision +++ b/config/nrfconnect/.nrfconnect-recommended-revision @@ -1 +1 @@ -ffcf07fe4586634a6793a48e5444a7196e7ebac6 +cfedfdfa08567b2252b511a4d1db15fbeba8152d diff --git a/config/nrfconnect/app/overlay-multi_image_dfu_support.conf b/config/nrfconnect/app/overlay-multi_image_dfu_support.conf index 7e78f41eaf2900..644a86c64d5835 100644 --- a/config/nrfconnect/app/overlay-multi_image_dfu_support.conf +++ b/config/nrfconnect/app/overlay-multi_image_dfu_support.conf @@ -22,13 +22,6 @@ CONFIG_NORDIC_QSPI_NOR=y CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 - # MCU Manager and SMP configuration CONFIG_MCUMGR=y CONFIG_MCUMGR_CMD_IMG_MGMT=y diff --git a/config/nrfconnect/app/overlay-single_image_dfu_support.conf b/config/nrfconnect/app/overlay-single_image_dfu_support.conf index bb329f79f2469e..363cd4bcd5f925 100644 --- a/config/nrfconnect/app/overlay-single_image_dfu_support.conf +++ b/config/nrfconnect/app/overlay-single_image_dfu_support.conf @@ -21,13 +21,6 @@ CONFIG_NORDIC_QSPI_NOR=y CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 - # MCU Manager and SMP configuration CONFIG_MCUMGR=y CONFIG_MCUMGR_CMD_IMG_MGMT=y diff --git a/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay index 68063fdeb48e84..aac348e1b971a5 100644 --- a/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay +++ b/examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay @@ -15,6 +15,9 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; /* * In some default configurations within the nRF Connect SDK, diff --git a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 4a69cbd6751c77..01794dc6524a33 100644 --- a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + /* * By default, PWM module is only configured for led0 (LED1 on the board). * The lighting-app, however, uses LED2 to show the state of the lighting, diff --git a/examples/lighting-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf b/examples/lighting-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf index 33b31f28a28561..de4023efbc3c52 100644 --- a/examples/lighting-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf +++ b/examples/lighting-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf @@ -22,13 +22,6 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 - # The following configurations are required to support simultaneous multi image update CONFIG_PCD_APP=y CONFIG_UPDATEABLE_IMAGE_NUMBER=2 diff --git a/examples/lighting-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf b/examples/lighting-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf index 3c1c6ccdfe7564..09e708c4e4dfff 100644 --- a/examples/lighting-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf +++ b/examples/lighting-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf @@ -21,10 +21,3 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 diff --git a/examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay index 7885945015b516..a4bac9fffc2f9d 100644 --- a/examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay +++ b/examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + /* * In some default configurations within the nRF Connect SDK, * e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell. diff --git a/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6984cad3ead2db..330f40f03f8f29 100644 --- a/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + soc { /* Add a flash controller which has the compatible * 'zephyr,sim-flash'. This will ensure that the flash diff --git a/examples/lock-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf b/examples/lock-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf index 33b31f28a28561..de4023efbc3c52 100644 --- a/examples/lock-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf +++ b/examples/lock-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf @@ -22,13 +22,6 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 - # The following configurations are required to support simultaneous multi image update CONFIG_PCD_APP=y CONFIG_UPDATEABLE_IMAGE_NUMBER=2 diff --git a/examples/lock-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf b/examples/lock-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf index 3c1c6ccdfe7564..09e708c4e4dfff 100644 --- a/examples/lock-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf +++ b/examples/lock-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf @@ -21,10 +21,3 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 diff --git a/examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay index e3716a4a9248e9..174d2d6a9ef3ce 100644 --- a/examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay +++ b/examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + /* * In some default configurations within the nRF Connect SDK, * e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell. diff --git a/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index e7e363e23d5998..0d142802009fe3 100644 --- a/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + soc { /* Add a flash controller which has the compatible * 'zephyr,sim-flash'. This will ensure that the flash diff --git a/examples/pump-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf b/examples/pump-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf index 33b31f28a28561..de4023efbc3c52 100644 --- a/examples/pump-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf +++ b/examples/pump-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf @@ -22,13 +22,6 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 - # The following configurations are required to support simultaneous multi image update CONFIG_PCD_APP=y CONFIG_UPDATEABLE_IMAGE_NUMBER=2 diff --git a/examples/pump-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf b/examples/pump-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf index 3c1c6ccdfe7564..09e708c4e4dfff 100644 --- a/examples/pump-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf +++ b/examples/pump-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf @@ -21,10 +21,3 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 diff --git a/examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay b/examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay index e3716a4a9248e9..174d2d6a9ef3ce 100644 --- a/examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay +++ b/examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + /* * In some default configurations within the nRF Connect SDK, * e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell. diff --git a/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index e7e363e23d5998..0d142802009fe3 100644 --- a/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -15,6 +15,10 @@ */ / { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + soc { /* Add a flash controller which has the compatible * 'zephyr,sim-flash'. This will ensure that the flash diff --git a/examples/pump-controller-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf b/examples/pump-controller-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf index 33b31f28a28561..de4023efbc3c52 100644 --- a/examples/pump-controller-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf +++ b/examples/pump-controller-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf @@ -22,13 +22,6 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 - # The following configurations are required to support simultaneous multi image update CONFIG_PCD_APP=y CONFIG_UPDATEABLE_IMAGE_NUMBER=2 diff --git a/examples/pump-controller-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf b/examples/pump-controller-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf index 3c1c6ccdfe7564..09e708c4e4dfff 100644 --- a/examples/pump-controller-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf +++ b/examples/pump-controller-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf @@ -21,10 +21,3 @@ CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 CONFIG_MULTITHREADING=y CONFIG_BOOT_MAX_IMG_SECTORS=256 - -# External flash memory configuration -CONFIG_PM_EXTERNAL_FLASH_SUPPORT_LEGACY=y -CONFIG_PM_EXTERNAL_FLASH=y -CONFIG_PM_EXTERNAL_FLASH_DEV_NAME="MX25R64" -CONFIG_PM_EXTERNAL_FLASH_SIZE=0x800000 -CONFIG_PM_EXTERNAL_FLASH_BASE=0 diff --git a/examples/pump-controller-app/nrfconnect/prj.conf b/examples/pump-controller-app/nrfconnect/prj.conf index ddb6056e80fc43..0811b93095ab23 100644 --- a/examples/pump-controller-app/nrfconnect/prj.conf +++ b/examples/pump-controller-app/nrfconnect/prj.conf @@ -28,7 +28,7 @@ CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread" CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" # Bluetooth overrides -CONFIG_BT_DEVICE_NAME="MatterPumpController" +CONFIG_BT_DEVICE_NAME="MatterPumpCtrl" # Additional configs for debbugging experience. CONFIG_THREAD_NAME=y diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/chip-build-nrf-platform/Dockerfile index 45e68edabb6d57..de3094203f9682 100644 --- a/integrations/docker/images/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/chip-build-nrf-platform/Dockerfile @@ -2,7 +2,7 @@ ARG VERSION=latest FROM connectedhomeip/chip-build:${VERSION} as build # Compatible Nordic Connect SDK revision. -ARG NCS_REVISION=ffcf07fe4586634a6793a48e5444a7196e7ebac6 +ARG NCS_REVISION=v1.8.0 RUN set -x \ && apt-get update \ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 9f8d8526aa9708..9fbc57d64762bd 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.5.39 Version bump reason: Push ESP forward, stop using 'depth 1' for checkouts +0.5.40 Version bump reason: nRF Connect SDK update