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

Source commit ID: @15a28718e4af
sync-ncs-aliro-15a28718e4af

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

Author: Marcin Kajor

Kconfig

@@ -19,7 +19,7 @@ menuconfig NCS_ALIRO
 	imply FLASH_MAP
 	imply REQUIRES_FULL_LIBCPP
 	imply REQUIRES_FULL_LIBC
-	imply NEWLIB_LIBC_NANO
+	imply NEWLIB_LIBC_NANO if NEWLIB_LIBC
 	help
 	  This option enables the Aliro reader stack.
 

README.md

@@ -5,11 +5,11 @@ NCS manifest repo for the door lock reference application.
 
 Before getting started, set up the nRF Connect SDK development environment.
 
-Follow the official [Installing the nRF Connect SDK](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html) guide and complete the following steps:
+Follow the official [Installing the nRF Connect SDK](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html) guide and complete the following steps:
 
-- [Update operating system](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html#update_operating_system)
-- [Install prerequisites](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html#install_prerequisites)
-- [Install the nRF Connect SDK toolchain](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html#install_the_nrf_connect_sdk_toolchain)
+- [Update operating system](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html#update_operating_system)
+- [Install prerequisites](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html#install_prerequisites)
+- [Install the nRF Connect SDK toolchain](https://docs.nordicsemi.com/bundle/ncs-3.2.0-preview2/page/nrf/installation/install_ncs.html#install_the_nrf_connect_sdk_toolchain)
 
 ### Initialization
 
@@ -19,13 +19,13 @@ the ``ncs-door-lock-app`` and all nRF Connect SDK modules will be cloned.
 Run the following commands:
 
 ```shell
-# launch nRF Connect toolchain for v3.1.0 release
-nrfutil sdk-manager toolchain launch --ncs-version v3.1.0 --shell
+# launch nRF Connect toolchain for v3.2.0-preview2 release
+nrfutil sdk-manager toolchain launch --ncs-version v3.2.0-preview2 --shell
 ```
 
 ```shell
-# initialize workspace for the ncs-door-lock-app (v0.4.0 release)
-west init -m https://github.com/nrfconnect/ncs-door-lock-app --mr v0.4.0 door-lock-workspace
+# initialize workspace for the ncs-door-lock-app (v0.5.0 release)
+west init -m https://github.com/nrfconnect/ncs-door-lock-app --mr v0.5.0 door-lock-workspace
 ```
 
 ```shell

app/Kconfig

@@ -8,7 +8,7 @@ module = NCS_DOOR_LOCK_APP
 module-str = NCS_DOOR_LOCK_APP
 module-dep = LOG
 module-help = Enables nRF Connect SDK Door Lock Application log messages.
-source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
+source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
 
 choice ACCESS_MANAGER_IMPLEMENTATION
 	prompt "Access Manager implementation"
@@ -63,9 +63,9 @@ endif # DOOR_LOCK_BLE_NUS
 if CHIP
 
 rsource "src/matter/Kconfig"
-source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
-source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
-source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/Kconfig"
+source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.features"
+source "$(ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR)/config/nrfconnect/chip-module/Kconfig.defaults"
+source "$(ZEPHYR_NRF_MODULE_DIR)/samples/matter/common/src/Kconfig"
 
 endif # CHIP
 

app/Kconfig.sysbuild

@@ -33,9 +33,6 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 
 if SOC_SERIES_NRF53X
 
-config MCUBOOT_UPDATEABLE_IMAGES
-    default 2
-
 config SECURE_BOOT_NETCORE
     default y
 
@@ -76,12 +73,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
 
 endif # SOC_SERIES_NRF53X
 
-if BOARD_NRF54L15DK
+if BOARD_NRF54L15DK || BOARD_NRF54LM20DK
 
+# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs.
 config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
 	default y
 
-endif # BOARD_NRF54L15DK
+endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
 
 endif # BOOTLOADER_MCUBOOT
 

app/boards/nrf52840dk_nrf52840.overlay

@@ -34,7 +34,7 @@
 	nucleo_nfc@0 {
 		compatible = "x-nucleo-nfc";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
 		irq-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
 		reset-gpios = <&gpio1 10 (GPIO_ACTIVE_LOW | GPIO_PULL_DOWN)>;
 	};
@@ -63,7 +63,7 @@
 	};
 
 	aliases {
-		access-decision-indicator = &led1; // green LED2 on nRF52840DK
+		access-decision-indicator = &led1; /* green LED2 on nRF52840DK */
 	};
 };
 

app/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -10,7 +10,7 @@
 	};
 
 	aliases {
-		access-decision-indicator = &led1; // green LED2 on nRF5340DK
+		access-decision-indicator = &led1; /* green LED2 on nRF5340DK */
 	};
 };
 
@@ -45,7 +45,7 @@
 	nucleo_nfc@0 {
 		compatible = "x-nucleo-nfc";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(5)>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
 		irq-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
 		reset-gpios = <&gpio1 10 (GPIO_ACTIVE_LOW | GPIO_PULL_DOWN)>;
 	};

app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -6,17 +6,23 @@
 
 / {
 	/* Disable buttons to avoid collision with interrupt and SCK pins for NFC tag reader.
-	   It also allows to use the button with the same label (1) on all supported dev kits. */
+	It also allows to use the button with the same label (1) on all supported dev kits. */
 	buttons {
 		/delete-node/ button_0;
 		/delete-node/ button_3;
 	};
 
+	leds {
+		/delete-node/ led_0;
+	};
+
 	aliases {
 		/delete-property/ sw0;
 		/delete-property/ sw3;
+		/delete-property/ led0;
+		/delete-property/ mcuboot-led0;
 		mcuboot-button0 = &button1;
-		access-decision-indicator = &led1; // green LED1 on nRF54L15DK
+		access-decision-indicator = &led2; /* green LED2 on nRF54L15DK */
 	};
 
 	nfc_power_switch: nfc_power_switch {
@@ -60,7 +66,7 @@
 	nucleo_nfc@0 {
 		compatible = "x-nucleo-nfc";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
 		irq-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
 	};
 };
@@ -77,7 +83,7 @@
 	status = "okay";
 };
 
-// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
+/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
 &cpuapp_rram {
 	reg = <0x0 DT_SIZE_K(1524)>;
 };

app/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay

@@ -26,16 +26,16 @@
 &spi21 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	cs-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
+	cs-gpios = <&gpio1 10 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>;
+		spi-max-frequency = <DT_FREQ_M(8)>;
+		irq-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 	};
 };
 
@@ -47,10 +47,17 @@
 		/delete-node/ button_0;
 	};
 
+	leds {
+		/delete-node/ led_0;
+	};
+
 
 	aliases {
 		/delete-property/ sw0;
-		access-decision-indicator = &led1; // green LED1 on nRF54LM20DK
+		/delete-property/ led0;
+		/delete-property/ mcuboot-led0;
+		mcuboot-button0 = &button1;
+		access-decision-indicator = &led2; /* green LED2 on nRF54LM20DK */
 	};
 
 	chosen {

app/prj.conf

@@ -21,7 +21,7 @@ CONFIG_MPU_STACK_GUARD=y
 CONFIG_SYS_HEAP_RUNTIME_STATS=y
 
 # Stack sizes
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=3072
 
 # Logging
 CONFIG_CONSOLE=y
@@ -60,6 +60,11 @@ CONFIG_RFAL_WORKER_THREAD_STACK_SIZE=8192
 # https://github.com/csa-access-control/aliro-actuator/issues/114
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
+# Override default values to match Aliro requirements for APDU message sizes.
+CONFIG_BT_BUF_ACL_RX_SIZE=271
+CONFIG_BT_BUF_ACL_TX_SIZE=271
+CONFIG_BT_L2CAP_TX_MTU=267
+
 #
 # Matter
 #

app/snippets/schedules/lock.matter

@@ -3076,6 +3076,9 @@ endpoint 0 {
     handle command UpdateFabricLabel;
     handle command RemoveFabric;
     handle command AddTrustedRootCertificate;
+    handle command SetVIDVerificationStatement;
+    handle command SignVIDVerificationRequest;
+    handle command SignVIDVerificationResponse;
   }
 
   server cluster GroupKeyManagement {
@@ -3119,7 +3122,7 @@ endpoint 1 {
     callback attribute acceptedCommandList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
 
     handle command Identify;
   }
@@ -3202,5 +3205,3 @@ endpoint 1 {
     handle command ClearAliroReaderConfig;
   }
 }
-
-