CI/CD: Synchronize ncs-aliro@da57546e672b and ncs-door-lock-app

Source commit ID: @da57546e672b
sync-ncs-aliro-da57546e672b

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.com>

Author: Marcin Kajor

Kconfig

@@ -15,39 +15,42 @@ menuconfig NCS_ALIRO
 	imply POLL
 	# storage
 	imply SETTINGS
-	imply NVS
 	imply FLASH
 	imply FLASH_MAP
+	imply REQUIRES_FULL_LIBCPP
+	imply REQUIRES_FULL_LIBC
+	imply NEWLIB_LIBC_NANO
 	help
 	  This option enables the Aliro reader stack.
 
 if NCS_ALIRO
 
-rsource "lib/aliro/interfaces/logger/Kconfig"
+orsource "lib/aliro/interfaces/logger/Kconfig"
 
-config ALIRO_BLE_TP
-	bool "Aliro BLE transport"
+config ALIRO_BLE_UWB
+	bool "Aliro Bluetooth LE (BLE) transport together with ultra wideband (UWB)"
 	help
 	  Enable the Aliro BLE transport protocol (TP). This is the transport layer
-	  used by Reader to communicate with the User Device. It is used to send and
-	  receive packets over BLE.
+	  used by the Reader to communicate with the User Device. It is used to send and
+	  receive packets over BLE. Additionally the UWB is enabled in order to manage the
+	  ranging between the Reader and the User Device.
 
 config DISABLE_ALIRO_NFC_TP
 	bool "Disable NFC transport protocol for development purposes"
 	help
 	  Disable the NFC transport protocol. This is useful if you want to use Aliro with BLE only.
 
-if ALIRO_BLE_TP
+if ALIRO_BLE_UWB
 
-config ALIRO_BLE_TP_MAX_SESSIONS
-	int "Maximum number of BLE sessions"
+config ALIRO_BLE_UWB_MAX_SESSIONS
+	int "Maximum number of BLE and UWB sessions"
 	default BT_MAX_CONN
 	help
-	  The maximum number of BLE sessions that can be established.
+	  The maximum number of BLE and UWB sessions that can be established.
 
 rsource "lib/aliro/Kconfig.ble.defconfig"
 
-endif # ALIRO_BLE_TP
+endif # ALIRO_BLE_UWB
 
 rsource "lib/aliro/Kconfig.defconfig"
 

app/Kconfig.sysbuild

@@ -13,6 +13,42 @@ config NRF_DEFAULT_IPC_RADIO
 config NETCORE_IPC_RADIO_BT_HCI_IPC
 	default y if SOC_SERIES_NRF53X
 
+#### Bootloader
+choice BOOTLOADER
+    default BOOTLOADER_MCUBOOT if MATTER || SOC_SERIES_NRF53X
+endchoice
+
+if BOOTLOADER_MCUBOOT
+
+choice MCUBOOT_MODE
+    default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
+
+choice BOOT_SIGNATURE_TYPE
+	default BOOT_SIGNATURE_TYPE_ECDSA_P256
+endchoice
+
+if SOC_SERIES_NRF53X
+
+config MCUBOOT_UPDATEABLE_IMAGES
+    default 2
+
+config SECURE_BOOT_NETCORE
+    default y
+
+config NETCORE_APP_UPDATE
+    default y
+
+config MCUBOOT_NRF53_MULTI_IMAGE_UPDATE
+    default y
+
+config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
+    default y
+
+endif # SOC_SERIES_NRF53X
+
+endif # BOOTLOADER_MCUBOOT
+
 if MATTER
 
 config WIFI_NRF70
@@ -23,11 +59,6 @@ config WIFI_NRF70
 config NETCORE_IPC_RADIO_IEEE802154
 	default y if SOC_SERIES_NRF53X && !WIFI_NRF70
 
-#### Bootloader
-choice BOOTLOADER
-	default BOOTLOADER_MCUBOOT if !BOARD_NRF21540DK
-endchoice
-
 if BOOTLOADER_MCUBOOT
 
 #### DFU multi-image support
@@ -37,29 +68,9 @@ config DFU_MULTI_IMAGE_PACKAGE_BUILD
 config DFU_MULTI_IMAGE_PACKAGE_APP
 	default y
 
-config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
-	default y
-
 #### DFU network core configuration
 if SOC_SERIES_NRF53X
 
-config MCUBOOT_UPDATEABLE_IMAGES
-	default 2
-
-choice MCUBOOT_MODE
-	default MCUBOOT_MODE_OVERWRITE_ONLY
-endchoice
-
-choice BOOT_SIGNATURE_TYPE
-	default BOOT_SIGNATURE_TYPE_RSA
-endchoice
-
-config SECURE_BOOT_NETCORE
-	default y
-
-config NETCORE_APP_UPDATE
-	default y
-
 config DFU_MULTI_IMAGE_PACKAGE_NET
 	default y
 
@@ -76,7 +87,7 @@ endif # BOOTLOADER_MCUBOOT
 
 #### Enable generating factory data
 config MATTER_FACTORY_DATA_GENERATE
-	default y if !BOARD_NRF21540DK
+	default y
 
 endif # MATTER
 

app/boards/nrf52840dk_nrf52840.overlay

@@ -57,12 +57,8 @@
 		compatible = "zephyr,psa-crypto-rng";
 		status = "okay";
 	};
-};
 
-/ {
-	access_decision_indicator: access_decision_indicator{
-		status = "okay";
-		compatible = "access-decision-indicator";
-		gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+	aliases {
+		access-decision-indicator = &led1; // green LED2 on nRF52840DK
 	};
 };

app/boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -4,6 +4,12 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+/{
+	aliases {
+		access-decision-indicator = &led1; // green LED2 on nRF5340DK
+	};
+};
+
 &pinctrl {
 	spi1_default_alt: spi1_default_alt {
 		group1 {
@@ -42,9 +48,7 @@
 };
 
 / {
-	access_decision_indicator: access_decision_indicator {
-		status = "okay";
-		compatible = "access-decision-indicator";
-		gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
 	};
 };

app/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -15,6 +15,7 @@
 		/delete-property/ sw0;
 		/delete-property/ sw3;
 		mcuboot-button0 = &button1;
+		access-decision-indicator = &led1; // green LED1 on nRF54L15DK
 	};
 };
 
@@ -59,12 +60,6 @@
 		compatible = "nfc-power-control";
 		gpios = <&gpio2 6 ( GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN )>;
 	};
-
-	access_decision_indicator: access_decision_indicator{
-		status = "okay";
-		compatible = "access-decision-indicator";
-		gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
-	};
 };
 
 &gpio0 {

app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&pinctrl {
+	spi21_default: spi21_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+			        <NRF_PSEL(SPIM_MOSI, 1, 11)>,
+			        <NRF_PSEL(SPIM_MISO, 1, 12)>;
+		};
+	};
+
+	spi21_sleep: spi21_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
+			        <NRF_PSEL(SPIM_MOSI, 1, 11)>,
+			        <NRF_PSEL(SPIM_MISO, 1, 12)>;
+			low-power-enable;
+		};
+	};
+};
+
+&spi21 {
+	compatible = "nordic,nrf-spim";
+	status = "okay";
+	cs-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
+
+	pinctrl-0 = <&spi21_default>;
+	pinctrl-1 = <&spi21_sleep>;
+	pinctrl-names = "default", "sleep";
+	nucleo_nfc@0 {
+		compatible = "x-nucleo-nfc";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(4)>;
+		irq-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+/ {
+	nfc_power_switch: nfc_power_switch {
+		status = "okay";
+		compatible = "nfc-power-control";
+		gpios = <&gpio1 22 ( GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN )>;
+	};
+
+	access_decision_indicator: access_decision_indicator{
+		status = "okay";
+		compatible = "access-decision-indicator";
+		gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
+	};
+
+	/* Disable led0 to avoid collision with NFC power switch. */
+	leds {
+		/delete-node/ led_0;
+	};
+
+	aliases {
+		/delete-property/ led0;
+		access-decision-indicator = &led1; // green LED1 on nRF54LM20DK
+	};
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio1 {
+	status = "okay";
+};

app/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay

@@ -0,0 +1,56 @@
+mcuboot:
+  address: 0x0
+  region: flash_primary
+  size: 0xD000
+mcuboot_pad:
+  address: 0xD000
+  region: flash_primary
+  size: 0x800
+app:
+  address: 0xD800
+  region: flash_primary
+  size: 0x1E2800
+mcuboot_primary:
+  address: 0xD000
+  orig_span: &id001
+  - app
+  - mcuboot_pad
+  region: flash_primary
+  size: 0x1E3000
+  span: *id001
+mcuboot_primary_app:
+  address: 0xD800
+  orig_span: &id002
+  - app
+  region: flash_primary
+  size: 0x1E2800
+  span: *id002
+factory_data:
+  address: 0x1F0000
+  region: flash_primary
+  size: 0x1000
+settings_storage:
+  address: 0x1F1000
+  region: flash_primary
+  size: 0xC000
+mcuboot_secondary:
+  address: 0x0
+  orig_span: &id003
+  - mcuboot_secondary_pad
+  - mcuboot_secondary_app
+  region: external_flash
+  size: 0x1E3000
+  span: *id003
+mcuboot_secondary_pad:
+  region: external_flash
+  address: 0x0
+  size: 0x800
+mcuboot_secondary_app:
+  region: external_flash
+  address: 0x800
+  size: 0x1E2800
+external_flash:
+  address: 0x1E3000
+  size: 0x5DB000
+  device: MX25R64
+  region: external_flash

…atic_nrf5340dk_nrf5340_cpuapp_matter.yml …p/pm_static_nrf5340dk_nrf5340_cpuapp.ymlapp/pm_static_nrf5340dk_nrf5340_cpuapp_matter.yml renamed to app/pm_static_nrf5340dk_nrf5340_cpuapp.yml app/pm_static_nrf5340dk_nrf5340_cpuapp_matter.yml renamed to app/pm_static_nrf5340dk_nrf5340_cpuapp.yml

@@ -52,13 +52,10 @@ CONFIG_SHELL_BACKEND_SERIAL_LOG_MESSAGE_QUEUE_SIZE=2048
 # RFAL worker stack size (TODO: optimize)
 CONFIG_RFAL_WORKER_THREAD_STACK_SIZE=8192
 
-CONFIG_ACCESS_DECISION_INDICATOR=y
-
 # Workaournd for Murata issue:
 # https://github.com/csa-access-control/aliro-actuator/issues/114
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
-
 #
 # Matter
 #
@@ -67,9 +64,6 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 CONFIG_CHIP_DEVICE_DISCRIMINATOR=0xBBB
 CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE=30033003
 
-# Configure ZAP file name
-CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH="${APPLICATION_CONFIG_DIR}/src/matter/default_zap/lock.zap"
-
 # 32774 == 0x8006 (example lock-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774