samples: matter: Stop overwriting zephyr,entropy identifier

LuDuda · LuDuda · commit aa6fd2cafd31 · 2025-06-30T09:30:06.000+02:00
Both Matter and OpenThread already use the PSA Random API to obtain
cryptographically secure random numbers (CSPRNG). This commit ensures
that other components fall back to the default entropy driver without
overriding the zephyr,entropy binding, when using it.

Signed-off-by: Łukasz Duda &lt;lukasz.duda@nordicsemi.no&gt;
diff --git a/samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay b/samples/matter/light_bulb/boards/nrf21540dk_nrf52840.overlay
@@ -5,17 +5,6 @@
  */
 
 / {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-
-	chosen {
-		zephyr,entropy = &rng;
-	};
-
 	/*
 	* By default, PWM module is only configured for led0 (LED1 on the board).
 	* The light bulb app, however, uses LED2 to show the state of the lighting,
diff --git a/samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_bulb/boards/nrf52840dk_nrf52840.overlay
@@ -9,17 +9,6 @@
 		nordic,pm-ext-flash = &mx25r64;
 	};
 
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-
-	chosen {
-		zephyr,entropy = &rng;
-	};
-
 	/*
 	* By default, PWM module is only configured for led0 (LED1 on the board).
 	* The light bulb app, however, uses LED2 to show the state of the lighting,
diff --git a/samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay b/samples/matter/light_switch/boards/nrf21540dk_nrf52840.overlay
@@ -3,18 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
-
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay b/samples/matter/light_switch/boards/nrf52840dk_nrf52840.overlay
@@ -7,16 +7,6 @@
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
-
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
 };
 
 /* Disable unused peripherals to reduce power consumption */
diff --git a/samples/matter/lock/boards/nrf21540dk_nrf52840.overlay b/samples/matter/lock/boards/nrf21540dk_nrf52840.overlay
@@ -3,18 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
-
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/samples/matter/lock/boards/nrf52840dk_nrf52840.overlay b/samples/matter/lock/boards/nrf52840dk_nrf52840.overlay
@@ -7,16 +7,6 @@
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
-
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
 };
 
 /* Disable unused peripherals to reduce power consumption */
diff --git a/samples/matter/manufacturer_specific/boards/nrf52840dk_nrf52840.overlay b/samples/matter/manufacturer_specific/boards/nrf52840dk_nrf52840.overlay
@@ -9,19 +9,6 @@
 	};
 };
 
-
-/ {
-	/*
-	 * In some default configurations within the nRF Connect SDK,
-	 * e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	 * This devicetree overlay ensures that default is overridden wherever it
-	 * is set, as this application uses the RNG node for entropy exclusively.
-	 */
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
-
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay b/samples/matter/smoke_co_alarm/boards/nrf52840dk_nrf52840.overlay
@@ -8,16 +8,6 @@
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
-
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
 };
 
 /* Disable unused peripherals to reduce power consumption */
diff --git a/samples/matter/template/boards/nrf21540dk_nrf52840.overlay b/samples/matter/template/boards/nrf21540dk_nrf52840.overlay
diff --git a/samples/matter/template/boards/nrf52840dk_nrf52840.overlay b/samples/matter/template/boards/nrf52840dk_nrf52840.overlay
@@ -9,19 +9,6 @@
 	};
 };
 
-
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
-
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/samples/matter/thermostat/boards/nrf52840dk_nrf52840.overlay b/samples/matter/thermostat/boards/nrf52840dk_nrf52840.overlay
@@ -9,19 +9,6 @@
 	};
 };
 
-
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
-
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";
diff --git a/samples/matter/window_covering/boards/nrf21540dk_nrf52840.overlay b/samples/matter/window_covering/boards/nrf21540dk_nrf52840.overlay
@@ -4,16 +4,6 @@
  */
 
 / {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-
 	/*
 	* Configure LED2 and LED3 to show the state of the
 	* window cover,by using the LED's brightness level.
diff --git a/samples/matter/window_covering/boards/nrf52840dk_nrf52840.overlay b/samples/matter/window_covering/boards/nrf52840dk_nrf52840.overlay
@@ -9,18 +9,7 @@
 	};
 };
 
-
 / {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-
 	/*
 	* Configure LED2 and LED3 to show the state of the
 	* window cover,by using the LED's brightness level.
diff --git a/samples/openthread/cli/boards/nrf21540dk_nrf52840.overlay b/samples/openthread/cli/boards/nrf21540dk_nrf52840.overlay
@@ -9,15 +9,3 @@
 	status = "okay";
 	hw-flow-control;
 };
-
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
diff --git a/samples/openthread/cli/boards/nrf52840dk_nrf52840.overlay b/samples/openthread/cli/boards/nrf52840dk_nrf52840.overlay
@@ -7,15 +7,3 @@
 	status = "okay";
 	hw-flow-control;
 };
-
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
diff --git a/samples/openthread/cli/boards/nrf52840dongle_nrf52840.overlay b/samples/openthread/cli/boards/nrf52840dongle_nrf52840.overlay
@@ -9,16 +9,6 @@
 };
 
 / {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-
 	/*
 	 * nRF52840 dongle has pin P0.19 connected to reset. By setting it
 	 * in `GPIO_OUTPUT_ACTIVE` mode, reset is pulled to GND,
diff --git a/samples/openthread/coap_client/boards/nrf21540dk_nrf52840.overlay b/samples/openthread/coap_client/boards/nrf21540dk_nrf52840.overlay
@@ -5,17 +5,6 @@
 
 /* Default Zephyr configuration already provides GPIO support for FEM. */
 
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
 &adc {
 	status = "disabled";
 };
diff --git a/samples/openthread/coap_client/boards/nrf52840dk_nrf52840.overlay b/samples/openthread/coap_client/boards/nrf52840dk_nrf52840.overlay
@@ -3,17 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/ {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
-	chosen {
-		zephyr,entropy = &rng;
-	};
-};
 &adc {
 	status = "disabled";
 };
diff --git a/samples/openthread/coap_server/boards/nrf21540dk_nrf52840.overlay b/samples/openthread/coap_server/boards/nrf21540dk_nrf52840.overlay
diff --git a/samples/openthread/coap_server/boards/nrf52840dk_nrf52840.overlay b/samples/openthread/coap_server/boards/nrf52840dk_nrf52840.overlay
diff --git a/samples/openthread/coprocessor/boards/nrf21540dk_nrf52840.overlay b/samples/openthread/coprocessor/boards/nrf21540dk_nrf52840.overlay
@@ -17,14 +17,7 @@
 };
 
 / {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
 	chosen {
-		zephyr,entropy = &rng;
 		zephyr,ot-uart = &uart0;
 	};
 };
diff --git a/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.conf b/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.conf
diff --git a/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.overlay b/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.overlay
@@ -15,14 +15,7 @@
 };
 
 / {
-	/*
-	* In some default configurations within the nRF Connect SDK,
-	* e.g. on nRF52840, the chosen zephyr,entropy node is &cryptocell.
-	* This devicetree overlay ensures that default is overridden wherever it
-	* is set, as this application uses the RNG node for entropy exclusively.
-	*/
 	chosen {
-		zephyr,entropy = &rng;
 		zephyr,ot-uart = &uart0;
 	};
 };
diff --git a/samples/openthread/coprocessor/snippets/hci/rcp_hci.overlay b/samples/openthread/coprocessor/snippets/hci/rcp_hci.overlay
