nrfconnect · ktaborowski · Apr 5, 2024 · Mar 20, 2024 · Mar 27, 2024 · Mar 27, 2024
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/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 
 if (CONFIG_SIDEWALK)
-    if(CONFIG_SOC_SERIES_NRF52X)
+    if(CONFIG_CPU_CORTEX_M4)
         add_subdirectory(cortex-m4)
     else()
         add_subdirectory(cortex-m33)

diff --git a/samples/sid_end_device/CMakeLists.txt b/samples/sid_end_device/CMakeLists.txt
@@ -19,10 +19,12 @@ 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)
+    set(PM_FILENAME "pm_static_no_dfu.yml")
 else()
-    set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
+    set(PM_FILENAME "pm_static_dfu.yml")
 endif()
+set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/${PM_FILENAME})
+
 
 # Zephyr CMake project
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})

diff --git a/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Workaround:
+# The nRF54L15 PDK (PCA10156) revisions v0.2.0 AA0-ES2, v0.2.0 AA0-ES3,
+# and v0.2.1 AB0-ES5 have Buttons 3 and 4 connected to the GPIO port
+# which does not support interrupts.
+CONFIG_DK_LIBRARY_BUTTON_NO_ISR=y
+
+CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n
diff --git a/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_no_dfu.conf b/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_no_dfu.conf
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Workaround:
+# The nRF54L15 PDK (PCA10156) revisions v0.2.0 AA0-ES2, v0.2.0 AA0-ES3,
+# and v0.2.1 AB0-ES5 have Buttons 3 and 4 connected to the GPIO port
+# which does not support interrupts.
+CONFIG_DK_LIBRARY_BUTTON_NO_ISR=y
+
+CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n
diff --git a/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf b/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_release.conf
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Workaround:
+# The nRF54L15 PDK (PCA10156) revisions v0.2.0 AA0-ES2, v0.2.0 AA0-ES3,
+# and v0.2.1 AB0-ES5 have Buttons 3 and 4 connected to the GPIO port
+# which does not support interrupts.
+CONFIG_DK_LIBRARY_BUTTON_NO_ISR=y
+
+CONFIG_SIDEWALK_SUBGHZ_SUPPORT=n
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,15 @@
+#
+# 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
+
+# Workaroud: fprotect and watchdog feed
+# are not supported in NCS v2.6.0
+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,15 @@
+#
+# 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
+
+# Workaroud: fprotect and watchdog feed
+# are not supported in NCS v2.6.0
+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/...device/configuration/pm_static_no_dfu.yml → .../nrf52840dk_nrf52840/pm_static_no_dfu.yml b/...device/configuration/pm_static_no_dfu.yml → .../nrf52840dk_nrf52840/pm_static_no_dfu.yml
diff --git a/samples/sid_end_device/pm_static.yml → ...340dk_nrf5340_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/pm_static.yml → ...340dk_nrf5340_cpuapp/pm_static_no_dfu.yml
@@ -1,8 +1,3 @@
-mcuboot:
-  address: 0x0
-  end_address: 0x8000
-  region: flash_primary
-  size: 0x8000
 mfg_storage:
   address: 0xff000
   end_address: 0x100000

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/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml
@@ -0,0 +1,4 @@
+mfg_storage:
+  address: 0x17c000
+  region: flash_primary
+  size: 0x1000
diff --git a/samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml
@@ -0,0 +1,5 @@
+mfg_storage:
+  address: 0xff000
+  end_address: 0x100000
+  region: flash_primary
+  size: 0x1000
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/scripts/ci/fill_hardware_map.py b/scripts/ci/fill_hardware_map.py
@@ -22,7 +22,7 @@
     "PCA10059": "nrf52840dongle_nrf52840",
     "PCA10095": "nrf5340dk_nrf5340_cpuapp",
     "PCA20053": "thingy53_nrf5340_cpuapp",
-    # "PCA10145": "nrf54h20dk_nrf54h20_cpuapp@soc1",
+    "PCA10156": "nrf54l15pdk_nrf54l15_cpuapp"
 }
 
 family_to_pca = {
@@ -32,7 +32,7 @@
     "NRF52840DONGLE": "PCA10059",
     "NRF5340": "PCA10095",
     "THINGY53": "PCA20053",
-    # "NRF54H20": "PCA10145"
+    "NRF54L15": "PCA10156"
 }
 
 
@@ -140,6 +140,10 @@ def main(hardware_map_path: str, userdev_conf_path: str):
                 # If newer nRF52 board, remove first serial interface
                 if segger.startswith("1050") and "-if02" in hw_entry["serial"]:
                     to_remove.append(hw_entry)
+            elif "nrf54l15pdk_nrf54l15_cpuapp" in hw_entry["platform"]:
+                # If nRF54l board, remove only first serial interface
+                if segger.startswith("1057") and "-if00" in hw_entry["serial"]:
+                    to_remove.append(hw_entry)
         else:
             # HW not known or not connected. Mark for removal
             to_remove.append(hw_entry)

diff --git a/subsys/sal/sid_pal/src/sid_mfg_storage.c b/subsys/sal/sid_pal/src/sid_mfg_storage.c
@@ -41,6 +41,8 @@ LOG_MODULE_REGISTER(sid_mfg, CONFIG_SIDEWALK_LOG_LEVEL);
 #elif defined(NRF_NETWORK)
 #define DEV_ID_REG (uint32_t)(NRF_FICR_NS->INFO.DEVICEID[0])
 #endif /* NRF5340_XXAA */
+#elif defined(NRF54L15_ENGA_XXAA)
+#define DEV_ID_REG (uint32_t)(NRF_FICR->INFO.DEVICEID[0])
 #else
 #error "Unknow Device ID register."
 #endif

diff --git a/tests/functional/critical_region/testcase.yaml b/tests/functional/critical_region/testcase.yaml
@@ -1,6 +1,7 @@
 tests:
   sidewalk.functional.critical_region:
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf54l15pdk_nrf54l15_cpuapp
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
diff --git a/tests/functional/crypto/Kconfig b/tests/functional/crypto/Kconfig
@@ -25,12 +25,8 @@ config ZTEST_STACK_SIZE
 config HEAP_MEM_POOL_SIZE
 	default 4096
 
-config MBEDTLS_ENABLE_HEAP
-	default y
-
 config MBEDTLS_HEAP_SIZE
 	default 4096
 
-source "${ZEPHYR_BASE}/../sidewalk/Kconfig"
-source "${ZEPHYR_BASE}/../sidewalk/Kconfig.dependencies"
 source "Kconfig.zephyr"
+source "${ZEPHYR_BASE}/../sidewalk/Kconfig.dependencies"
diff --git a/tests/functional/crypto/prj.conf b/tests/functional/crypto/prj.conf
@@ -3,6 +3,6 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-CONFIG_UNITY=y
 CONFIG_ZTEST=y
 CONFIG_MAIN_THREAD_PRIORITY=14
+CONFIG_CONSOLE_PUTCHAR_BUFSIZE=512
diff --git a/tests/functional/crypto/testcase.yaml b/tests/functional/crypto/testcase.yaml
@@ -1,7 +1,8 @@
 tests:
   sidewalk.functional.crypto:
     tags: Sidewalk
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf54l15pdk_nrf54l15_cpuapp
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp
diff --git a/tests/functional/interrupts/testcase.yaml b/tests/functional/interrupts/testcase.yaml
@@ -1,7 +1,8 @@
 tests:
   unity.sidewalk.functional.interrupts:
     tags: Sidewalk
-    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp
+    platform_allow: nrf52840dk_nrf52840 nrf5340dk_nrf5340_cpuapp nrf54l15pdk_nrf54l15_cpuapp
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf5340dk_nrf5340_cpuapp
+      - nrf54l15pdk_nrf54l15_cpuapp