Skip to content

Commit 3482bdb

Browse files
author
Rafal Miecznik
committed
CI/CD: Synchronize ncs-aliro@b2a9e5e0a94f and ncs-door-lock-app
Source commit ID: @b2a9e5e0a94f sync-ncs-aliro-b2a9e5e0a94f Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>
1 parent 5f393db commit 3482bdb

185 files changed

Lines changed: 14324 additions & 1133 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Aliro standardizes the interaction that lets a phone or wearable act as a digita
66

77
## Getting started
88

9-
To get started with the nRF Door Lock and Access Control Add-on, follow the [documentation](https://docs.nordicsemi.com/bundle/door_lock_and_access_control_1.0.0/page/index.html).
9+
To get started with the nRF Door Lock and Access Control Add-on, follow the [documentation](https://docs.nordicsemi.com/bundle/aliro_1.0.0/page/index.html).
1010

1111
## License
1212

‎app/Kconfig.defconfig‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ config MBEDTLS_PSA_CRYPTO_STORAGE_C
1414
default y
1515

1616
choice TRUSTED_STORAGE_BACKEND_AEAD_KEY
17-
default TRUSTED_STORAGE_BACKEND_AEAD_KEY_HASH_UID if SOC_SERIES_NRF52X
17+
default TRUSTED_STORAGE_BACKEND_AEAD_KEY_HASH_UID if SOC_SERIES_NRF52
1818
default TRUSTED_STORAGE_BACKEND_AEAD_KEY_DERIVE_FROM_HUK
1919
endchoice
2020

2121
config HW_UNIQUE_KEY_WRITE_ON_CRYPTO_INIT
22-
default y if (SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54LX)
22+
default y if (SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54L)
2323

2424
# required by Aliro persistent storage
2525
config FLASH
@@ -90,3 +90,12 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
9090
default 2048
9191

9292
endif # !CHIP
93+
94+
config DOOR_LOCK_ALIRO_CRYPTO_UTILS
95+
default y
96+
97+
config DOOR_LOCK_SETTINGS_UTILS
98+
default y
99+
100+
config DOOR_LOCK_ALIRO_WORKQUEUE
101+
default y

‎app/Kconfig.sysbuild‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ config NRF_DEFAULT_IPC_RADIO
1111
# Enable Bluetooth serialization to network core
1212
# This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image
1313
config NETCORE_IPC_RADIO_BT_HCI_IPC
14-
default y if SOC_SERIES_NRF53X
14+
default y if SOC_SERIES_NRF53
1515

1616
#### Bootloader
1717
choice BOOTLOADER
@@ -31,7 +31,7 @@ endchoice
3131
config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
3232
default y
3333

34-
if SOC_SERIES_NRF53X
34+
if SOC_SERIES_NRF53
3535

3636
config SECURE_BOOT_NETCORE
3737
default y
@@ -42,7 +42,7 @@ config NETCORE_APP_UPDATE
4242
config MCUBOOT_NRF53_MULTI_IMAGE_UPDATE
4343
default y
4444

45-
endif # SOC_SERIES_NRF53X
45+
endif # SOC_SERIES_NRF53
4646

4747
endif # BOOTLOADER_MCUBOOT
4848

@@ -54,7 +54,7 @@ config WIFI_NRF70
5454
# Enable IEEE802.15.4 serialization to network core
5555
# This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
5656
config NETCORE_IPC_RADIO_IEEE802154
57-
default y if SOC_SERIES_NRF53X && !WIFI_NRF70
57+
default y if SOC_SERIES_NRF53 && !WIFI_NRF70
5858

5959
if BOOTLOADER_MCUBOOT
6060

@@ -66,12 +66,12 @@ config DFU_MULTI_IMAGE_PACKAGE_APP
6666
default y
6767

6868
#### DFU network core configuration
69-
if SOC_SERIES_NRF53X
69+
if SOC_SERIES_NRF53
7070

7171
config DFU_MULTI_IMAGE_PACKAGE_NET
7272
default y
7373

74-
endif # SOC_SERIES_NRF53X
74+
endif # SOC_SERIES_NRF53
7575

7676
if BOARD_NRF54L15DK || BOARD_NRF54LM20DK
7777

‎app/boards/nrf52840dk_nrf52840.overlay‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
spi0_default_alt: spi0_default_alt {
99
group1 {
1010
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
11-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
12-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
11+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
12+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
1313
};
1414
};
1515

1616
spi0_sleep_alt: spi0_sleep_alt {
1717
group1 {
1818
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
19-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
20-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
19+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
20+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
2121
low-power-enable;
2222
};
2323
};
@@ -31,10 +31,13 @@
3131
pinctrl-0 = <&spi0_default_alt>;
3232
pinctrl-1 = <&spi0_sleep_alt>;
3333
pinctrl-names = "default", "sleep";
34+
3435
nucleo_nfc@0 {
3536
compatible = "x-nucleo-nfc";
3637
reg = <0>;
3738
spi-max-frequency = <DT_FREQ_M(8)>;
39+
spi-cs-setup-delay-ns = <1000>;
40+
spi-cs-hold-delay-ns = <1000>;
3841
irq-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
3942
reset-gpios = <&gpio1 10 (GPIO_ACTIVE_LOW | GPIO_PULL_DOWN)>;
4043
};

‎app/boards/nrf52840dk_nrf52840_release.overlay‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@
3333
&usbd {
3434
status = "disabled";
3535
};
36-

‎app/boards/nrf5340dk_nrf5340_cpuapp.overlay‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,19 @@
1818
spi1_default_alt: spi1_default_alt {
1919
group1 {
2020
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
21-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
22-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
21+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
22+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
2323
};
2424
};
2525

2626
spi1_sleep_alt: spi1_sleep_alt {
2727
group1 {
2828
psels = <NRF_PSEL(SPIM_SCK, 1, 15)>,
29-
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
30-
<NRF_PSEL(SPIM_MISO, 1, 14)>;
29+
<NRF_PSEL(SPIM_MOSI, 1, 13)>,
30+
<NRF_PSEL(SPIM_MISO, 1, 14)>;
3131
low-power-enable;
3232
};
3333
};
34-
3534
};
3635

3736
&spi1 {
@@ -42,10 +41,13 @@
4241
pinctrl-0 = <&spi1_default_alt>;
4342
pinctrl-1 = <&spi1_sleep_alt>;
4443
pinctrl-names = "default", "sleep";
44+
4545
nucleo_nfc@0 {
4646
compatible = "x-nucleo-nfc";
4747
reg = <0>;
4848
spi-max-frequency = <DT_FREQ_M(8)>;
49+
spi-cs-setup-delay-ns = <1000>;
50+
spi-cs-hold-delay-ns = <1000>;
4951
irq-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
5052
reset-gpios = <&gpio1 10 (GPIO_ACTIVE_LOW | GPIO_PULL_DOWN)>;
5153
};

‎app/boards/nrf5340dk_nrf5340_cpuapp_release.overlay‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@
3333
&spi4 {
3434
status = "disabled";
3535
};
36-

‎app/boards/nrf54l15dk_nrf54l15_cpuapp.overlay‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
/ {
88
/* Disable buttons to avoid collision with interrupt and SCK pins for NFC tag reader.
9-
It also allows to use the button with the same label (1) on all supported dev kits. */
9+
* It also allows to use the button with the same label (1) on all supported dev kits.
10+
*/
1011
buttons {
1112
/delete-node/ button_0;
1213
/delete-node/ button_3;
@@ -28,7 +29,7 @@
2829
nfc_power_switch: nfc_power_switch {
2930
status = "okay";
3031
compatible = "nfc-power-control";
31-
gpios = <&gpio2 6 ( GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN )>;
32+
gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
3233
};
3334

3435
chosen {
@@ -40,16 +41,16 @@
4041
spi21_default: spi21_default {
4142
group1 {
4243
psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
43-
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
44-
<NRF_PSEL(SPIM_MISO, 1, 12)>;
44+
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
45+
<NRF_PSEL(SPIM_MISO, 1, 12)>;
4546
};
4647
};
4748

4849
spi21_sleep: spi21_sleep {
4950
group1 {
5051
psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
51-
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
52-
<NRF_PSEL(SPIM_MISO, 1, 12)>;
52+
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
53+
<NRF_PSEL(SPIM_MISO, 1, 12)>;
5354
low-power-enable;
5455
};
5556
};
@@ -63,10 +64,13 @@
6364
pinctrl-0 = <&spi21_default>;
6465
pinctrl-1 = <&spi21_sleep>;
6566
pinctrl-names = "default", "sleep";
67+
6668
nucleo_nfc@0 {
6769
compatible = "x-nucleo-nfc";
6870
reg = <0>;
6971
spi-max-frequency = <DT_FREQ_M(8)>;
72+
spi-cs-setup-delay-ns = <1000>;
73+
spi-cs-hold-delay-ns = <1000>;
7074
irq-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
7175
};
7276
};

‎app/boards/nrf54l15dk_nrf54l15_cpuapp_release.overlay‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@
2525
&spi22 {
2626
status = "disabled";
2727
};
28-

‎app/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
spi21_default: spi21_default {
99
group1 {
1010
psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
11-
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
12-
<NRF_PSEL(SPIM_MISO, 1, 12)>;
11+
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
12+
<NRF_PSEL(SPIM_MISO, 1, 12)>;
1313
};
1414
};
1515

1616
spi21_sleep: spi21_sleep {
1717
group1 {
1818
psels = <NRF_PSEL(SPIM_SCK, 1, 13)>,
19-
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
20-
<NRF_PSEL(SPIM_MISO, 1, 12)>;
19+
<NRF_PSEL(SPIM_MOSI, 1, 11)>,
20+
<NRF_PSEL(SPIM_MISO, 1, 12)>;
2121
low-power-enable;
2222
};
2323
};
@@ -31,18 +31,21 @@
3131
pinctrl-0 = <&spi21_default>;
3232
pinctrl-1 = <&spi21_sleep>;
3333
pinctrl-names = "default", "sleep";
34+
3435
nucleo_nfc@0 {
3536
compatible = "x-nucleo-nfc";
3637
reg = <0>;
3738
spi-max-frequency = <DT_FREQ_M(8)>;
39+
spi-cs-setup-delay-ns = <1000>;
40+
spi-cs-hold-delay-ns = <1000>;
3841
irq-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
3942
};
4043
};
4144

4245
/ {
43-
4446
/* Disable button0 to align with the nRF54L15DK.
45-
It also allows to use the button with the same label (1) on all supported dev kits. */
47+
* It also allows to use the button with the same label (1) on all supported dev kits.
48+
*/
4649
buttons {
4750
/delete-node/ button_0;
4851
};
@@ -51,7 +54,6 @@
5154
/delete-node/ led_0;
5255
};
5356

54-
5557
aliases {
5658
/delete-property/ sw0;
5759
/delete-property/ led0;
@@ -63,7 +65,6 @@
6365
chosen {
6466
nordic,pm-ext-flash = &mx25r64;
6567
};
66-
6768
};
6869

6970
&gpio0 {
@@ -74,6 +75,13 @@
7475
status = "okay";
7576
};
7677

78+
&rram_controller {
79+
cpuapp_rram: rram@0 {
80+
reg = <0x0 DT_SIZE_K(2036)>;
81+
ranges = <0x0 0x0 DT_SIZE_K(2036)>;
82+
};
83+
};
84+
7785
&mx25r64 {
7886
status = "okay";
7987
};

0 commit comments

Comments
 (0)