Skip to content
Open
7 changes: 6 additions & 1 deletion boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
zephyr,bt-hci = &bt_hci_ipc0;
nordic,802154-spinel-ipc = &ipc0;
zephyr,canbus = &can120;
zephyr,entropy = &prng;
zephyr,entropy = &psa_rng;
};

aliases {
Expand Down Expand Up @@ -111,6 +111,11 @@

prng: prng {
compatible = "nordic,entropy-prng";
status = "disabled";
};

psa_rng: psa-rng {
compatible = "zephyr,psa-crypto-rng";
status = "okay";
};
};
Expand Down
16 changes: 11 additions & 5 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,23 @@
zephyr,ieee802154 = &cpurad_ieee802154;
zephyr,bt-hci-ipc = &ipc0;
nordic,802154-spinel-ipc = &ipc0;
zephyr,entropy = &prng;
};
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
zephyr,entropy = &psa_rng;
};

aliases {
ipc-to-cpusys = &cpurad_cpusys_ipc;
resetinfo = &cpurad_resetinfo;
};

prng: prng {
compatible = "nordic,entropy-prng";
status = "disabled";
};

psa_rng: psa-rng {
compatible = "zephyr,psa-crypto-rng";
status = "okay";
};
};

&cpurad_bellboard {
Expand Down
1 change: 1 addition & 0 deletions subsys/secure_storage/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
menuconfig SECURE_STORAGE
bool "Secure storage subsystem"
depends on !BUILD_WITH_TFM
depends on !NRF_IRONSIDE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing # in Upstream PR #

select MBEDTLS_PSA_CRYPTO_STORAGE_C if MBEDTLS_PSA_CRYPTO_C
select EXPERIMENTAL
help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_POWER_DOMAIN=n
CONFIG_SSF_CLIENT_SYS_INIT=n
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_POWER_DOMAIN=n
CONFIG_SSF_CLIENT_SYS_INIT=n
Loading