Skip to content

Commit

Permalink
[nrfconnect] Update nRF Connect SDK version to 1.8
Browse files Browse the repository at this point in the history 
* Update NCS version to recently released 1.8
* Update configuration for external flash
* Shorted the pump controller app BLE name to fit in the
  default limit.
  • Loading branch information
@Damian-Nordic @andy31415
Damian-Nordic authored and andy31415 committed Dec 15, 2021
1 parent 6afd51d commit dd45189
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 74 deletions.
2 changes: 1 addition & 1 deletion config/nrfconnect/.nrfconnect-recommended-revision
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ffcf07fe4586634a6793a48e5444a7196e7ebac6
cfedfdfa08567b2252b511a4d1db15fbeba8152d
7 changes: 0 additions & 7 deletions config/nrfconnect/app/overlay-multi_image_dfu_support.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions config/nrfconnect/app/overlay-single_image_dfu_support.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions examples/lighting-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
*/

/ {
chosen {
nordic,pm-ext-flash = &mx25r64;
};

/*
* In some default configurations within the nRF Connect SDK,
Expand Down
4 changes: 4 additions & 0 deletions examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions examples/lighting-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/lighting-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions examples/lock-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/lock-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/lock-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions examples/pump-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/pump-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/pump-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions examples/pump-controller-app/nrfconnect/boards/nrf52840dk_nrf52840.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/pump-controller-app/nrfconnect/configuration/mcuboot_multi_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions examples/pump-controller-app/nrfconnect/configuration/mcuboot_single_image_dfu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/pump-controller-app/nrfconnect/prj.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-nrf-platform/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit dd45189

Please sign in to comment.