Skip to content

[nrf noup] boards: nordic: Fake entropy revert #3446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 3, 2025
Merged

[nrf noup] boards: nordic: Fake entropy revert #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1143f69
Revert "[nrf noup] boards: nordic: Enable PSA RNG for nrf54h20"
seko-nordic Oct 31, 2025
32281d6
Revert "[nrf noup] dts: arm: nordic: remove L20 dts"
seko-nordic Oct 31, 2025
e307d1a
Revert "[nrf noup] entropy: Add fake entropy nRF PRNG driver"
seko-nordic Oct 31, 2025
7f24ef7
[nrf noup] boards: nordic: Enable PSA RNG for nrf54h20
Vge0rge Sep 5, 2024
f145fe1
[nrf noup] boards: nordic: Enable PSA RNG for nrf9280
seko-nordic Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@
};
};

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

psa_rng: psa-rng {
compatible = "zephyr,psa-crypto-rng";
status = "okay";
Expand Down
5 changes: 0 additions & 5 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
resetinfo = &cpurad_resetinfo;
};

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

psa_rng: psa-rng {
compatible = "zephyr,psa-crypto-rng";
status = "okay";
Expand Down
6 changes: 3 additions & 3 deletions boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
zephyr,shell-uart = &uart136;
zephyr,bt-hci = &bt_hci_ipc0;
nordic,802154-spinel-ipc = &ipc0;
zephyr,entropy = &prng;
zephyr,entropy = &psa_rng;
};

aliases {
Expand Down Expand Up @@ -109,8 +109,8 @@
};
};

prng: prng {
compatible = "nordic,entropy-prng";
psa_rng: psa-rng {
compatible = "zephyr,psa-crypto-rng";
status = "okay";
};
};
Expand Down
11 changes: 6 additions & 5 deletions boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@
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;
};

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

&cpuapp_cpurad_ram0x_region {
Expand Down
7 changes: 0 additions & 7 deletions drivers/entropy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,4 @@ zephyr_library_sources_ifdef(CONFIG_ENTROPY_TELINK_B91_TRNG entropy_b91_trng
zephyr_library_sources_ifdef(CONFIG_ENTROPY_VIRTIO entropy_virtio.c)
# zephyr-keep-sorted-stop

if (CONFIG_FAKE_ENTROPY_NRF_PRNG)
zephyr_library_sources(fake_entropy_nrf_prng.c)

message(WARNING "\nA nRF PRNG is used, which does not produce real random bits."
"This is not secure and should therefore never be used in a product.")
endif()

zephyr_library_link_libraries_ifdef(CONFIG_BUILD_WITH_TFM tfm_api)
1 change: 0 additions & 1 deletion drivers/entropy/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ source "drivers/entropy/Kconfig.neorv32"
source "drivers/entropy/Kconfig.npcx"
source "drivers/entropy/Kconfig.nrf5"
source "drivers/entropy/Kconfig.nrf_cracen"
source "drivers/entropy/Kconfig.nrf_prng"
source "drivers/entropy/Kconfig.nxp"
source "drivers/entropy/Kconfig.psa_crypto"
source "drivers/entropy/Kconfig.renesas_ra"
Expand Down
19 changes: 0 additions & 19 deletions drivers/entropy/Kconfig.nrf_prng
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions drivers/entropy/fake_entropy_nrf_prng.c
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions dts/bindings/rng/nordic,nrf-prng.yaml
View file
Open in desktop

This file was deleted.