build: fix build issue with child_image

KRKNWK-18680 fix configuration of crypto test Signed-off-by: Robert Gałat <[email protected]>
nrfconnect · Mar 22, 2024 · 3d4cb15 · 3d4cb15
1 parent 2aa5815
commit 3d4cb15
Show file tree

Hide file tree

Showing 26 changed files with 135 additions and 427 deletions.
diff --git a/.github/workflows/common-build_and_run.yml b/.github/workflows/common-build_and_run.yml
@@ -11,7 +11,7 @@ on:
         description: 'platforms to build for'
         required: false
         type: string
-        default: '["nrf52840dk_nrf52840", "nrf5340dk_nrf5340_cpuapp"]'
+        default: '["nrf52840dk_nrf52840", "nrf5340dk_nrf5340_cpuapp", "nrf54l15pdk_nrf54l15_cpuapp"]'
       run_tests:
         description: 'run tests on HW after building'
         type: boolean

diff --git a/Kconfig.dependencies b/Kconfig.dependencies
@@ -92,8 +92,16 @@ config PSA_WANT_ALG_CBC_PKCS7
 config PSA_WANT_ALG_HKDF
 	default n
 
+config HEAP_MEM_POOL_SIZE
+	default 4096
+
+config MBEDTLS_HEAP_SIZE
+	default 4096
+
 endif #SIDEWALK_CRYPTO
 
+
+
 config SIDEWALK_LOG
 	bool
 	default SIDEWALK

diff --git a/samples/sid_end_device/CMakeLists.txt b/samples/sid_end_device/CMakeLists.txt
@@ -19,7 +19,11 @@ if(CONF_FILE)
 endif()
 
 if("${CONFIG_FILE_NAME}" STREQUAL "prj_no_dfu.conf")
-    set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/pm_static_no_dfu.yml)
+    if("${BOARD}" STREQUAL "nrf54l15pdk_nrf54l15_cpuapp")
+        set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml)
+    else()
+        set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/pm_static_no_dfu.yml)
+    endif()
 else()
     set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
 endif()

diff --git a/...oards/nrf54l15pdk_nrf54l15_cpuapp.overlay → ...oards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/...oards/nrf54l15pdk_nrf54l15_cpuapp.overlay → ...oards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -58,14 +58,3 @@
 	   };
 	};
 };
-
-&uart30 {
-	status = "okay";
-};
-
-/ {
-	chosen {
-		zephyr,console = &uart30;
-		zephyr,shell-uart = &uart30;
-	};
-};
diff --git a/samples/sid_end_device/child_image/mcuboot/Kconfig.root b/samples/sid_end_device/child_image/mcuboot/Kconfig.root
@@ -35,14 +35,6 @@ config FLASH
 config FPROTECT
     default y
 
-config NORDIC_QSPI_NOR
-    default y
-
-config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
-    default 4096
-
-config NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE
-    default 16
 
 config BOOT_MAX_IMG_SECTORS
     default 256

diff --git a/samples/sid_end_device/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/sid_end_device/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2021 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+
+# Ensure that the qspi driver is disabled by default
+CONFIG_NORDIC_QSPI_NOR=n
+
+# TODO: below are not yet supported and need fixing
+CONFIG_FPROTECT=n
+CONFIG_BOOT_WATCHDOG_FEED=n
diff --git a/samples/sid_end_device/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/sid_end_device/child_image/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2021 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+
+# Ensure that the qspi driver is disabled by default
+CONFIG_NORDIC_QSPI_NOR=n
+
+# TODO: below are not yet supported and need fixing
+CONFIG_FPROTECT=n
+CONFIG_BOOT_WATCHDOG_FEED=n
diff --git a/samples/sid_end_device/child_image/mcuboot/prj.conf b/samples/sid_end_device/child_image/mcuboot/prj.conf
@@ -5,6 +5,10 @@
 
 CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
+CONFIG_BOOT_ENCRYPT_IMAGE=n
+CONFIG_CBPRINTF_NANO=y
+CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0
+
 CONFIG_BOOT_UPGRADE_ONLY=n
 CONFIG_RESET_ON_FATAL_ERROR=y
 

diff --git a/samples/sid_end_device/child_image/mcuboot/prj_release.conf b/samples/sid_end_device/child_image/mcuboot/prj_release.conf
@@ -5,6 +5,10 @@
 
 CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
+CONFIG_BOOT_ENCRYPT_IMAGE=n
+CONFIG_CBPRINTF_NANO=y
+CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0
+
 CONFIG_BOOT_UPGRADE_ONLY=n
 CONFIG_RESET_ON_FATAL_ERROR=y
 

diff --git a/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml b/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml
@@ -0,0 +1,4 @@
+mfg_storage:
+  address: 0x17c000
+  region: flash_primary
+  size: 0x1000
diff --git a/samples/sid_end_device/configuration/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/samples/sid_end_device/configuration/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml
@@ -0,0 +1,4 @@
+mfg_storage:
+  address: 0x17c000
+  region: flash_primary
+  size: 0x1000
diff --git a/samples/sid_end_device/pm_static.yml b/samples/sid_end_device/pm_static.yml
diff --git a/samples/sid_end_device/sample.yaml b/samples/sid_end_device/sample.yaml
@@ -4,75 +4,103 @@ sample:
 tests:
   sample.sidewalk.hello:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_configs:
       - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk hello
 
   sample.sidewalk.hello.release:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_args:
       CONF_FILE=prj_release.conf
     extra_configs:
       - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk hello
 
   sample.sidewalk.hello.no_dfu:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_args:
       CONF_FILE=prj_no_dfu.conf
     extra_configs:
       - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk hello
 
   sample.sidewalk.hello.ble_only:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_configs:
       - CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk hello BLE
 
   sample.sidewalk.hello.ble_only.release:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_args:
       CONF_FILE=prj_release.conf
     extra_configs:
       - CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk hello BLE
 
   sample.sidewalk.demo:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_args:
       OVERLAY_CONFIG="overlay-demo.conf"
     extra_configs:
       - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk demo
 
   sample.sidewalk.demo.ble_only:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp thingy53_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - thingy53_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_args:
       OVERLAY_CONFIG="overlay-demo.conf"
     extra_configs:
@@ -81,16 +109,21 @@ tests:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
       - thingy53_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk demo BLE
 
   sample.sidewalk.dut:
     build_only: true
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow:
+      - nrf52840dk_nrf52840
+      - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     extra_args:
       OVERLAY_CONFIG="overlay-dut.conf"
     extra_configs:
       - CONFIG_SIDEWALK_FILE_TRANSFER=y
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
     tags: Sidewalk cli
diff --git a/tests/functional/mfg_storage/src/main.c b/tests/functional/mfg_storage/src/main.c
@@ -24,8 +24,7 @@
  * MFG_START_OFFSET = 0x0FF000
  * MFG_END_OFFSET   = 0x100000
  */
-#define MFG_END_OFFSET                                                                             \
-	(FIXED_PARTITION_OFFSET(sidewalk_storage) + FIXED_PARTITION_SIZE(sidewalk_storage))
+#define MFG_END_OFFSET (FIXED_PARTITION_OFFSET(mfg_storage) + FIXED_PARTITION_SIZE(mfg_storage))
 #define MFG_START_OFFSET (MFG_END_OFFSET - MFG_STORAGE_SIZE)
 
 static uint8_t test_data_buffer[512];
@@ -96,8 +95,8 @@ ZTEST(mfg_storage, test_1sid_pal_mfg_storage_no_init)
 ZTEST(mfg_storage, test_2sid_pal_mfg_storage_init)
 {
 	static const sid_pal_mfg_store_region_t mfg_store_region = {
-		.addr_start = MFG_START_OFFSET,
-		.addr_end = MFG_END_OFFSET,
+		.addr_start = PM_MFG_STORAGE_ADDRESS,
+		.addr_end = PM_MFG_STORAGE_END_ADDRESS,
 	};
 
 	sid_pal_mfg_store_init(mfg_store_region);

diff --git a/tests/functional/spi_bus/Kconfig b/tests/functional/spi_bus/Kconfig
@@ -9,6 +9,13 @@ config SIDEWALK_BUILD
 config SIDEWALK_SUBGHZ_SUPPORT
 	default y
 
+config SIDEWALK_SUBGHZ_TRIM_CAP_VAL
+	hex "value for trim cap used by subGHz radio"
+	range 0x0 0xFFFF
+	default 0x1212
+	help
+	  The value of the trim cap. Default value works for Semtech SX1262 shield 
+
 config SIDEWALK_SPI_BUS
 	default y
 	imply SPI

diff --git a/tests/functional/spi_bus/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/functional/spi_bus/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
@@ -58,14 +58,3 @@
 	   };
 	};
 };
-
-&uart30 {
-	status = "okay";
-};
-
-/ {
-	chosen {
-		zephyr,console = &uart30;
-		zephyr,shell-uart = &uart30;
-	};
-};
diff --git a/tests/manual/ble/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/manual/ble/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay