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

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

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.com>

Author: Adrian Gielniewski

CMakeLists.txt

@@ -6,3 +6,4 @@
 
 add_subdirectory(drivers)
 add_subdirectory(lib)
+add_subdirectory(subsys)

CODEOWNERS

@@ -6,11 +6,13 @@
 
 rsource "drivers/Kconfig"
 rsource "lib/Kconfig"
+rsource "subsys/Kconfig"
 
 menuconfig NCS_DOOR_LOCK
 	bool "NCS Door Lock Application [EXPERIMENTAL]"
 	depends on (SOC_SERIES_NRF54LX || SOC_SERIES_NRF53X || SOC_SERIES_NRF52X)
 	select EXPERIMENTAL
+	select NCS_ALIRO
 	imply NFC_T4T_APDU
 	imply POLL
 	# storage
@@ -25,21 +27,15 @@ menuconfig NCS_DOOR_LOCK
 
 if NCS_DOOR_LOCK
 
-orsource "lib/aliro/interfaces/logger/Kconfig"
-
 config DOOR_LOCK_BLE_UWB
 	bool "Aliro Bluetooth LE (BLE) transport together with ultra wideband (UWB)"
+	select NCS_ALIRO_BLE_UWB
 	help
 	  Enable the Aliro BLE transport protocol (TP). This is the transport layer
 	  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 DOOR_LOCK_BLE_UWB
 
 config DOOR_LOCK_BLE_UWB_MAX_SESSIONS
@@ -79,4 +75,14 @@ rsource "lib/aliro/Kconfig.ble.defconfig"
 
 endif # DOOR_LOCK_BLE_UWB || DOOR_LOCK_DFU_BLE_SMP || DOOR_LOCK_BLE_NUS
 
+config DOOR_LOCK_RELEASE
+    bool "Enable Aliro release configuration"
+    help
+      In this configuration:
+      Aliro stack logs are disabled.
+      RFAL NFC driver logs are disabled.
+      Shell commands are disabled.
+      Device reset automatically on fatal error.
+
 endif # NCS_DOOR_LOCK
+

Kconfig

@@ -10,50 +10,14 @@ module-dep = LOG
 module-help = Enables nRF Connect SDK Door Lock Application log messages.
 source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
 
-choice DOOR_LOCK_ACCESS_MANAGER_IMPLEMENTATION
-	prompt "Access Manager implementation"
-	default DOOR_LOCK_ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
-
-	config DOOR_LOCK_ACCESS_MANAGER_IMPLEMENTATION_DEFAULT
-		bool "Access Manager default implementation"
-		help
-		  Uses the default implementation of the Access Manager
-		  provided by the Door Lock Reference Application.
-
-	config DOOR_LOCK_ACCESS_MANAGER_IMPLEMENTATION_CUSTOM
-		bool "Access Manager custom implementation"
-		help
-		  Uses a custom implementation of the Access Manager.
-		  This implementation is based on provided template
-		  that can be tailored to specific requirements.
-endchoice
-
 config DOOR_LOCK_CLI
 	bool "Door Lock CLI support"
-	default y
+	default y if (!DOOR_LOCK_RELEASE || !CHIP)
 	select SHELL
 	select REBOOT
 	help
 	  Enable support for Door Lock CLI.
 
-config DOOR_LOCK_PRINT_READER_GROUP_IDENTIFIER
-	bool "Print reader group identifier that should be provisioned into the User Device"
-	default y
-	help
-	  Enable printing of the reader group identifier that should be provisioned into the User Device.
-
-config DOOR_LOCK_USE_TEST_READER_IDENTIFIER
-	bool "Use test reader identifier"
-	default y
-	help
-	  Initialize the reader Group Identifier and Group Sub Identifier to test values.
-
-config DOOR_LOCK_USE_TEST_KEYS
-	bool "Use test keys"
-	default y
-	help
-	  Initialize the reader keys to test values.
-
 rsource "src/aliro/Kconfig"
 
 if DOOR_LOCK_BLE_NUS

app/Kconfig

@@ -70,3 +70,9 @@
 &mx25r64 {
 	status = "okay";
 };
+
+&gpio0 {
+	status = "okay";
+	/* Use PORT event rather than GPIOTE IN event, to save power */
+	sense-edge-mask = <0x00000008>; /* P0.03 */
+};

app/boards/nrf52840dk_nrf52840.overlay

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "nrf52840dk_nrf52840.overlay"
+
+&uart1 {
+	status = "disabled";
+};
+
+&adc {
+	status = "disabled";
+};
+
+&i2c0 {
+	status = "disabled";
+};
+
+&i2c1 {
+	status = "disabled";
+};
+
+&pwm0 {
+	status = "disabled";
+};
+
+&nfct {
+	status = "disabled";
+};
+
+&usbd {
+	status = "disabled";
+};
+

app/boards/nrf52840dk_nrf52840_release.overlay

@@ -54,3 +54,9 @@
 &mx25r64 {
 	status = "okay";
 };
+
+&gpio0 {
+	status = "okay";
+	/* Use PORT event rather than GPIOTE IN event, to save power */
+	sense-edge-mask = <0x00000010>; /* P0.04 */
+};

app/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "nrf5340dk_nrf5340_cpuapp.overlay"
+
+&uart1 {
+	status = "disabled";
+};
+
+&adc {
+	status = "disabled";
+};
+
+&i2c1 {
+	status = "disabled";
+};
+
+&pwm0 {
+	status = "disabled";
+};
+
+&nfct {
+	status = "disabled";
+};
+
+&usbd {
+	status = "disabled";
+};
+
+&spi4 {
+	status = "disabled";
+};
+

app/boards/nrf5340dk_nrf5340_cpuapp_release.overlay

@@ -91,3 +91,9 @@
 &mx25r64 {
 	status = "okay";
 };
+
+&gpio0 {
+	status = "okay";
+	/* Use PORT event rather than GPIOTE IN event, to save power */
+	sense-edge-mask = <0x00000010>; /* P0.04 */
+};

app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "nrf54l15dk_nrf54l15_cpuapp.overlay"
+
+&uart30 {
+	status = "disabled";
+};
+
+&adc {
+	status = "disabled";
+};
+
+&pwm20 {
+	status = "disabled";
+};
+
+&nfct {
+	status = "disabled";
+};
+
+&spi22 {
+	status = "disabled";
+};
+