nrfconnect · carlescufi · Nov 27, 2024 · Nov 19, 2024 · Nov 20, 2024 · Nov 20, 2024
@@ -110,7 +110,7 @@ config GETOPT
 	default n
 
 # Temporary hack to be able to build samples and tests on the nRF51L15 FLPR core
-if (SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR) && PARTITION_MANAGER_ENABLED
+if SOC_NRF54L15_CPUFLPR && PARTITION_MANAGER_ENABLED
 config FLASH_BASE_ADDRESS
 	hex
 	default 0x0

@@ -26,7 +26,7 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 
 config ML_APP_INCLUDE_REMOTE_IMAGE
 	bool "Include remote image build"
-	depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	depends on SOC_NRF54H20_CPUAPP
 
 config ML_APP_REMOTE_BOARD
 	string "The name of the board to be used by remote image"

@@ -5,7 +5,6 @@ common:
   integration_platforms:
     - nrf5340_audio_dk/nrf5340/cpuapp
   platform_allow: nrf5340_audio_dk/nrf5340/cpuapp
-  platform_exclude: nrf5340_audio_dk/nrf5340/cpuapp_ns
   sysbuild: true
   build_only: true
   tags: ci_build sysbuild

@@ -6,7 +6,7 @@
 
 menuconfig DESKTOP_DVFS
 	bool "DVFS module [EXPERIMENTAL]"
-	depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP
+	depends on SOC_NRF54H20_CPUAPP
 	select EXPERIMENTAL
 	select NRFS_DVFS_SERVICE_ENABLED
 	select CLOCK_CONTROL

@@ -222,14 +222,6 @@
 
 | Native Simulator | | native_sim | ``native_sim`` |
 
-.. nrf54l15pdk_nrf54l15_cpuapp
-
-| :ref:`nRF54L15 PDK <ug_nrf54l15_gs>` | PCA10156 | :ref:`nrf54l15pdk <zephyr:nrf54l15pdk_nrf54l15>` | ``nrf54l15pdk/nrf54l15/cpuapp`` |
-
-.. [email protected]_nrf54l15_cpuapp
-
-| :ref:`nRF54L15 PDK <ug_nrf54l15_gs>` | PCA10156 | :ref:`nrf54l15pdk <zephyr:nrf54l15pdk_nrf54l15>` | ``[email protected]/nrf54l15/cpuapp`` |
-
 .. nrf54l15dk_nrf54l15_cpuapp
 
 | :ref:`nRF54L15 DK <ug_nrf54l>` | PCA10156 | :ref:`nrf54l15dk <zephyr:nrf54l15dk_nrf54l15>` | ``nrf54l15dk/nrf54l15/cpuapp`` |

@@ -258,7 +258,7 @@ Amazon Sidewalk
 
 * Added:
 
-  * Experimental support for the Bluetooth LE and sub-GHz protocols on the :ref:`zephyr:nrf54l15pdk_nrf54l15`.
+  * Experimental support for the Bluetooth LE and sub-GHz protocols on the nRF54L15 PDK.
   * Support for the DFU FUOTA.
 
 * Updated:
@@ -349,7 +349,7 @@ Thread
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` in the :ref:`ot_cli_sample` and :ref:`ot_coprocessor_sample` samples.
+  * Support for the nRF54L15 PDK in the :ref:`ot_cli_sample` and :ref:`ot_coprocessor_sample` samples.
   * New :ref:`feature set <thread_ug_feature_sets>` option :kconfig:option:`CONFIG_OPENTHREAD_NORDIC_LIBRARY_RCP`.
 
 Zigbee
@@ -372,7 +372,7 @@ Enhanced ShockBurst (ESB)
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and the :ref:`zephyr:nrf54l15pdk_nrf54l15`.
+  * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and the nRF54L15 PDK.
   * Fast switching between radio states for the nRF54H20 SoC.
   * Fast radio channel switching for the nRF54H20 SoC.
 
@@ -381,7 +381,7 @@ Wi-Fi
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and :ref:`zephyr:nrf54l15pdk_nrf54l15` boards with :ref:`nRF7002 EB <ug_nrf7002eb_gs>`.
+  * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards with :ref:`nRF7002 EB <ug_nrf7002eb_gs>`.
   * General enhancements in low-power mode including watchdog based recovery.
 
 Applications
@@ -483,7 +483,7 @@ nRF Desktop
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` with the ``nrf54l15pdk/nrf54l15/cpuapp`` board target.
+  * Support for the nRF54L15 PDK with the ``nrf54l15pdk/nrf54l15/cpuapp`` board target.
 
     The PDK can act as a sample mouse or keyboard.
     It supports the Bluetooth LE HID data transport and uses SoftDevice Link Layer with Low Latency Packet Mode (LLPM) enabled.
@@ -601,7 +601,7 @@ Bluetooth samples
     * :ref:`peripheral_status` sample
     * :ref:`shell_bt_nus` sample
 
-  * Support for both the :ref:`zephyr:nrf54h20dk_nrf54h20` and the :ref:`zephyr:nrf54l15pdk_nrf54l15` boards in the following samples:
+  * Support for both the :ref:`zephyr:nrf54h20dk_nrf54h20` and the nRF54L15 PDK boards in the following samples:
 
     * :ref:`peripheral_lbs` sample
     * :ref:`bluetooth_central_hids` sample
@@ -626,7 +626,7 @@ Bluetooth Fast Pair samples
 
 * :ref:`fast_pair_input_device` sample:
 
-  * Added support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board.
+  * Added support for the nRF54L15 PDK board.
 
   * Updated:
 
@@ -638,7 +638,7 @@ Bluetooth Fast Pair samples
 Bluetooth Mesh samples
 ----------------------
 
-* Added support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board in the following samples:
+* Added support for the nRF54L15 PDK board in the following samples:
 
   * :ref:`bluetooth_mesh_sensor_client` sample
   * :ref:`bluetooth_mesh_sensor_server` sample
@@ -743,7 +743,7 @@ Cryptography samples
 * Added:
 
     * :ref:`crypto_spake2p` sample.
-    * Support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board for all crypto samples.
+    * Support for the nRF54L15 PDK board for all crypto samples.
     * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board in all crypto samples, except :ref:`crypto_persistent_key` and :ref:`crypto_tls`.
     * Support for the :ref:`zephyr:nrf9151dk_nrf9151` board for all crypto samples.
     * Support for the :ref:`nRF9161 DK <ug_nrf9161>` board for the :ref:`crypto_test`.
@@ -771,7 +771,7 @@ Enhanced ShockBurst samples
 
 * :ref:`esb_prx` sample:
 
-  * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and :ref:`zephyr:nrf54l15pdk_nrf54l15` boards.
+  * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards.
 
 Keys samples
 ------------
@@ -787,7 +787,7 @@ Matter samples
     By utilizing the test event triggers, you can simulate various operational conditions and responses in your Matter device without the need for external setup.
     To get started with using test event triggers in your Matter samples and to understand the capabilities of this feature, refer to the :ref:`ug_matter_test_event_triggers` page.
 
-  * Support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` with the ``nrf54l15pdk/nrf54l15/cpuapp`` board target to the following Matter samples:
+  * Support for the nRF54L15 PDK with the ``nrf54l15pdk/nrf54l15/cpuapp`` board target to the following Matter samples:
 
     * :ref:`matter_template_sample` sample.
     * :ref:`matter_light_bulb_sample` sample.
@@ -865,8 +865,8 @@ NFC samples
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board in the :ref:`nrf-nfc-system-off-sample` sample.
-  * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and :ref:`zephyr:nrf54l15pdk_nrf54l15` boards in the following samples:
+  * Support for the nRF54L15 PDK board in the :ref:`nrf-nfc-system-off-sample` sample.
+  * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards in the following samples:
 
     * :ref:`record_launch_app` sample
     * :ref:`record_text` sample
@@ -879,14 +879,14 @@ Peripheral samples
 
 * :ref:`radio_test` sample:
 
-  * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and :ref:`zephyr:nrf54l15pdk_nrf54l15` boards.
+  * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards.
 
   * The CLI command ``fem tx_power_control <tx_power_control>`` replaces ``fem tx_gain <tx_gain>`` .
     This change applies to the sample built with the :ref:`CONFIG_RADIO_TEST_POWER_CONTROL_AUTOMATIC <CONFIG_RADIO_TEST_POWER_CONTROL_AUTOMATIC>` set to ``n``.
 
 * :ref:`802154_phy_test` sample:
 
-  * Added support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board.
+  * Added support for the nRF54L15 PDK board.
 
 * :ref:`802154_sniffer` sample:
 
@@ -917,11 +917,11 @@ Thread samples
 
 * :ref:`ot_cli_sample` sample:
 
-  * Added support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board.
+  * Added support for the nRF54L15 PDK board.
 
 * :ref:`ot_coprocessor_sample` sample:
 
-  * Added support for the :ref:`zephyr:nrf54l15pdk_nrf54l15` board.
+  * Added support for the nRF54L15 PDK board.
   * Changed the default :ref:`feature set <thread_ug_feature_sets>` from Master to RCP.
 
 Zigbee samples

@@ -337,7 +337,7 @@ Security
 
   * The :kconfig:option:`CONFIG_CRACEN_IKG_SEED_KMU_SLOT` Kconfig option to allow customization of the KMU slot used to store CRACEN's Internal Key Generator (IKG) seed.
     The default IKG seed slot is now 183 (previously 0).
-  * TF-M support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``).
+  * TF-M support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``).
   * The ``west ncs-provision`` command, which allows to provision signature verification keys to the nRF54L15 SoC over the J-Link interface.
 
 * Deprecated legacy Mbed TLS crypto toolbox APIs that are enabled when the :kconfig:option:`CONFIG_NORDIC_SECURITY_BACKEND` Kconfig option is set.
@@ -546,7 +546,7 @@ nRF Desktop
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
+  * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
   * A debug configuration enabling the `Fast Pair`_ feature on the nRF54L15 DK with the ``nrf54l15dk/nrf54l15/cpuapp`` board target.
   * An application versioning using the :file:`VERSION` file.
     The versioning is only applied to the application configurations that use the MCUboot bootloader.
@@ -708,7 +708,7 @@ Bluetooth samples
 Bluetooth Fast Pair samples
 ---------------------------
 
-* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
+* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
 
 * Updated:
 
@@ -742,7 +742,7 @@ Bluetooth Mesh samples
 
 * Added:
 
-  * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
+  * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
   * Support for Zephyr Memory Storage (ZMS) when compiling for the :ref:`zephyr:nrf54l15dk_nrf54l15` board.
 
 * :ref:`bluetooth_ble_peripheral_lbs_coex` sample:
@@ -823,7 +823,7 @@ Cellular samples
 Cryptography samples
 --------------------
 
-* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``).
+* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``).
 
 Debug samples
 -------------
@@ -852,7 +852,7 @@ Matter samples
 
   * The :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILES_PATH` Kconfig option, which specifies ZAP files location for the sample.
     By default, the option points to the :file:`src/default_zap` directory and can be changed to any path relative to sample's location that contains the ZAP file and :file:`zap-generated` directory.
-  * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15`, replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15`.
+  * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15`, replacing the nRF54L15 PDK.
   * Support for :ref:`Trusted Firmware-M <ug_tfm>` on the nRF54L15 SoC.
   * The :ref:`matter_smoke_co_alarm_sample` sample that demonstrates implementation of Matter Smoke CO alarm device type.
   * The :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_LEDS` Kconfig option, which can be used to disable the LEDs in the Matter sample or application.
@@ -945,7 +945,7 @@ Protocols serialization samples
 Trusted Firmware-M (TF-M) samples
 ---------------------------------
 
-* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (``nrf54l15pdk/nrf54l15/cpuapp/ns``).
+* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (``nrf54l15pdk/nrf54l15/cpuapp/ns``).
 
 * :ref:`tfm_psa_template` sample:
 
@@ -1005,7 +1005,7 @@ Other samples
 
 * :ref:`coremark_sample` sample:
 
-  * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the :ref:`zephyr:nrf54l15pdk_nrf54l15` (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
+  * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``).
   * Updated the logging mode to minimal (:kconfig:option:`CONFIG_LOG_MODE_MINIMAL`) to reduce the sample's memory footprint and ensure no logging interference with the running benchmark.
 
 Drivers

@@ -6,6 +6,7 @@
 #   - Keep nrf/installation/recommended_versions.rst up to date
 
 # Extension                       | NCS | Kconfig | Matter | MCUboot | nrfxlib | TF-M | Zephyr |
+anytree                         # |     |         |        |         |         |      |   X    |
 azure-storage-blob              # |  X  |         |        |         |         |      |        |
 doxmlparser                     # |     |         |        |         |         |      |   X    |
 m2r2                            # |     |         |        |         |         |      |        |

@@ -12,36 +12,12 @@ if DK_LIBRARY
 
 config DK_LIBRARY_BUTTON_SCAN_INTERVAL
 	int "Scanning interval of buttons in milliseconds"
-	default 50 if DK_LIBRARY_BUTTON_NO_ISR
 	default 10
 
 config DK_LIBRARY_DYNAMIC_BUTTON_HANDLERS
 	bool "Enable the runtime assignable button handler API"
 	default y
 
-config DK_LIBRARY_BUTTON_NO_ISR
-	bool "Poll buttons unconditionally (no interrupts) [EXPERIMENTAL]"
-	# Workaround for buttons on nRF54L15 PDK in revision 0.2.x.
-	default y if BOARD_NRF54L15PDK_NRF54L15_CPUAPP && (BOARD_REVISION = "0.2.0" || BOARD_REVISION = "0.2.1")
-	select EXPERIMENTAL
-	help
-	  With this option disabled, the module periodically scans all the
-	  available buttons until no button is pressed. If no button is
-	  pressed, the module uses GPIO interrupts to detect the first button
-	  press. On the first button press, the module switches back to
-	  periodically scanning buttons.
-
-	  Enable this option to avoid relying on GPIO interrupts at all and
-	  to unconditionally scan all buttons periodically. Please note that
-	  the constant scanning activity increases the overall power
-	  consumption of the system.
-
-	  For example, in case the application uses Button 3 or 4, the option
-	  must be set for the nRF54L15 PDK (PCA10156) revisions
-	  v0.2.0 AA0-ES2, v0.2.0 AA0-ES3, and v0.2.1 AB0-ES5.
-	  These versions of the PDK have Buttons 3 and 4 connected to
-	  the GPIO port which does not support interrupts.
-
 module = DK_LIBRARY
 module-str = DK library
 source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"

@@ -129,9 +129,7 @@ static void buttons_scan_fn(struct k_work *work)
 	static bool initial_run = true;
 	uint32_t button_scan;
 
-	__ASSERT_NO_MSG(!IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR) || !irq_enabled);
-
-	if (!IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR) && irq_enabled) {
+	if (irq_enabled) {
 		/* Disable GPIO interrupts for edge triggered devices.
 		 * Devices that are configured with active high interrupts are already disabled.
 		 */
@@ -159,7 +157,7 @@ static void buttons_scan_fn(struct k_work *work)
 
 	last_button_scan = button_scan;
 
-	if (IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR) || (button_scan != 0)) {
+	if (button_scan != 0) {
 		k_work_reschedule(&buttons_scan,
 		  K_MSEC(CONFIG_DK_LIBRARY_BUTTON_SCAN_INTERVAL));
 	} else {
@@ -238,6 +236,7 @@ static void button_pressed(const struct device *gpio_dev, struct gpio_callback *
 
 int dk_buttons_init(button_handler_t button_handler)
 {
+	uint32_t pin_mask = 0;
 	int err;
 
 	button_handler_cb = button_handler;
@@ -259,31 +258,27 @@ int dk_buttons_init(button_handler_t button_handler)
 		}
 	}
 
-	if (!IS_ENABLED(CONFIG_DK_LIBRARY_BUTTON_NO_ISR)) {
-		uint32_t pin_mask = 0;
-
-		for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
-			/* Module starts in scanning mode and will switch to
-			 * callback mode if no button is pressed.
-			 */
-			err = gpio_pin_interrupt_configure_dt(&buttons[i],
-							      GPIO_INT_DISABLE);
-			if (err) {
-				LOG_ERR("Cannot disable callbacks()");
-				return err;
-			}
-
-			pin_mask |= BIT(buttons[i].pin);
+	for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
+		/* Module starts in scanning mode and will switch to
+		 * callback mode if no button is pressed.
+		 */
+		err = gpio_pin_interrupt_configure_dt(&buttons[i],
+						      GPIO_INT_DISABLE);
+		if (err) {
+			LOG_ERR("Cannot disable callbacks()");
+			return err;
 		}
 
-		gpio_init_callback(&gpio_cb, button_pressed, pin_mask);
+		pin_mask |= BIT(buttons[i].pin);
+	}
 
-		for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
-			err = gpio_add_callback(buttons[i].port, &gpio_cb);
-			if (err) {
-				LOG_ERR("Cannot add callback");
-				return err;
-			}
+	gpio_init_callback(&gpio_cb, button_pressed, pin_mask);
+
+	for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
+		err = gpio_add_callback(buttons[i].port, &gpio_cb);
+		if (err) {
+			LOG_ERR("Cannot add callback");
+			return err;
 		}
 	}
 

@@ -8,8 +8,8 @@ menu "CoreMark sample"
 
 config APP_MODE_FLASH_AND_RUN
 	bool "Run CoreMark benchmark on start up" if \
-		!(SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR)
-	default y if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR
+		!(SOC_NRF54H20_CPUPPR)
+	default y if SOC_NRF54H20_CPUPPR
 	help
 	  If enabled, CoreMark will start execution immediately after the CPU starts up.
 	  It also disables LEDs and buttons.