[nrfconnect] Update nRF Connect SDK version to 1.8 (#13031)

* [nrfconnect] Update nRF Connect SDK version to 1.8 * 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. * Fix RPC build and remove unused chip_build_pw_rpc_lib * Bump Docker image version in workflow
project-chip · Dec 15, 2021 · fc5be12 · fc5be12
1 parent e1986bc
commit fc5be12
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 162 deletions.
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.33
+            image: connectedhomeip/chip-build-nrf-platform:0.5.40
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git 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
@@ -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
@@ -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/config/nrfconnect/chip-gn/BUILD.gn b/config/nrfconnect/chip-gn/BUILD.gn
@@ -19,22 +19,12 @@ import("${chip_root}/build/chip/tests.gni")
 
 assert(current_os == "zephyr")
 
-declare_args() {
-  chip_build_pw_rpc_lib = false
-}
-
 group("nrfconnect") {
   deps = [ "${chip_root}/src/lib" ]
 
   if (chip_build_tests) {
     deps += [ "${chip_root}/src:tests" ]
   }
-
-  # Building PW_RPC lib with GN may go obsolete after getting full CMake
-  # support in Pigweed.
-  if (chip_build_pw_rpc_lib) {
-    deps += [ "lib/pw_rpc" ]
-  }
 }
 
 group("default") {

diff --git a/config/nrfconnect/chip-gn/lib/pw_rpc/BUILD.gn b/config/nrfconnect/chip-gn/lib/pw_rpc/BUILD.gn
diff --git a/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -121,10 +121,6 @@ if (NOT CHIP_LIBRARIES)
     set(CHIP_LIBRARIES -lCHIP)
 endif()
 
-if (CONFIG_CHIP_PW_RPC)
-    list(APPEND CHIP_LIBRARIES -lPwRpc)
-endif()
-
 # Set up CHIP project configuration file
 
 if (CONFIG_CHIP_PROJECT_CONFIG)
@@ -180,10 +176,6 @@ find_package(Python3 REQUIRED)
 # Generate configuration for CHIP GN build system
 # ==============================================================================
 
-if (CONFIG_CHIP_PW_RPC)
-    chip_gn_arg_import("${GN_ROOT_TARGET}/lib/pw_rpc/pw_rpc.gni")
-endif()
-
 chip_gn_arg_cflags("target_cflags"                          ${CHIP_CFLAGS})
 chip_gn_arg_cflags("target_cflags_c"                        ${CHIP_CFLAGS_C})
 chip_gn_arg_cflags("target_cflags_cc"                       ${CHIP_CFLAGS_CC})
@@ -202,7 +194,6 @@ chip_gn_arg_bool  ("chip_build_tests"                       CONFIG_CHIP_BUILD_TE
 chip_gn_arg_bool  ("chip_monolithic_tests"                  CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_build_libshell"                    CONFIG_CHIP_LIB_SHELL)
-chip_gn_arg_bool  ("chip_build_pw_rpc_lib"                  CONFIG_CHIP_PW_RPC)
 
 if (CONFIG_CHIP_ENABLE_DNSSD_SRP)
     chip_gn_arg_string("chip_mdns" "platform")

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/platform/nrfconnect/pw_sys_io/CMakeLists.txt b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(suppress_zephyr_warnings INTERFACE)
 target_compile_options(suppress_zephyr_warnings INTERFACE
     -Wno-redundant-decls
     -Wno-missing-field-initializers
+    -Wno-cast-qual
 )
 
 pw_add_module_library(pw_sys_io.nrfconnect

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ffcf07fe4586634a6793a48e5444a7196e7ebac6
		cfedfdfa08567b2252b511a4d1db15fbeba8152d
-Original file 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 @@