samples: mss: Create sysbuild overlays

Create companion overlays for customizing configs that recently became sysbuild configs IRIS-8989 Signed-off-by: Georges Oates_Larsen <[email protected]>
nrfconnect · Jun 5, 2024 · dd4fd1d · dd4fd1d
1 parent ca4f64c
commit dd4fd1d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/samples/cellular/nrf_cloud_multi_service/sample.yaml b/samples/cellular/nrf_cloud_multi_service/sample.yaml
@@ -83,7 +83,7 @@ tests:
       - nrf9161dk/nrf9161/ns
     extra_args: nrf_cloud_multi_service_SHIELD=nrf7002ek
       EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
-      SB_CONFIG_WIFI_NRF700X=y SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y
+      SB_CONF_FILE="sysbuild_nrf700x-wifi-scan.conf"
     tags: ci_build sysbuild
   sample.cellular.nrf7002ek_wifi.conn:
     sysbuild: true
@@ -93,7 +93,5 @@ tests:
     platform_allow: nrf5340dk/nrf5340/cpuapp/ns
     extra_args: nrf_cloud_multi_service_SHIELD=nrf7002ek
       EXTRA_CONF_FILE="overlay_nrf7002ek_wifi_no_lte.conf"
-      SB_CONFIG_BOOTLOADER_NONE=y
-      SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n
-      SB_CONFIG_WIFI_NRF700X=y
+      SB_CONF_FILE="sysbuild_nrf700x-wifi-conn.conf"
     tags: ci_build sysbuild
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild.conf
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2023 Nordic Semiconductor
+# Copyright (c) 2024 Nordic Semiconductor
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
 SB_CONFIG_BOOTLOADER_MCUBOOT=y
-SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
+SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild_ext_flash.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild_ext_flash.conf
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-conn.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-conn.conf
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+SB_CONFIG_WIFI_NRF700X=y
+SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=n
+
+# MCUboot disabled for Wi-Fi connectivity builds in order to save flash
+SB_CONFIG_BOOTLOADER_NONE=y
+SB_CONFIG_BOOTLOADER_MCUBOOT=n
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-scan.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-scan.conf
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+SB_CONFIG_WIFI_NRF700X=y
+SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y
+
+# MCUboot enabled for scan-only Wi-Fi builds
+SB_CONFIG_BOOTLOADER_MCUBOOT=y