Upmerge 25-03-2024

.github/test-spec.yml

@@ -57,7 +57,6 @@
 
 "CI-audio-test":
  - "applications/nrf5340_audio/**/*"
- - "boards/arm/nrf5340_audio_dk_nrf5340/**/*"
  - "tests/nrf5340_audio/**/*"
  - "tests/lib/contin_array/**/*"
  - "tests/lib/pcm_mix/**/*"
@@ -266,10 +265,9 @@
 
 "CI-desktop-test":
  - "applications/nrf_desktop/**/*"
- - "boards/arm/*dmouse*/**/*"
- - "boards/arm/*kbd*/**/*"
- - "boards/arm/*dongle*/**/*"
- - "boards/arm/*gmouse*/**/*"
+ - "boards/nordic/*mouse/**/*"
+ - "boards/nordic/*kbd/**/*"
+ - "boards/nordic/*dongle/**/*"
  - "cmake/*"
  - "drivers/sensor/pmw3360/**/*"
  - "drivers/sensor/paw3212/**/*"

Kconfig.nrf

@@ -51,7 +51,7 @@ config WARN_EXPERIMENTAL
 # Zephyr default is newlib and not newlib-nano for consistency between architectures.
 # To reduce FLASH footprint, newlib-nano is preferred default in NCS when newlib is selected.
 config NEWLIB_LIBC_NANO
- default y
+ default y if SOC_FAMILY_NORDIC_NRF
  depends on NEWLIB_LIBC && HAS_NEWLIB_LIBC_NANO
 
 # This is a temporary solution to whitelist

applications/asset_tracker_v2/Kconfig.sysbuild

@@ -5,9 +5,9 @@
 #
 
 config SECURE_BOOT
- default y if $(BOARD) = "nrf9160dk_nrf9160_ns"
+ default y if BOARD_NRF9160DK_NRF9160_NS
 
 config SECURE_BOOT_APPCORE
- default y if $(BOARD) = "nrf9160dk_nrf9160_ns"
+ default y if BOARD_NRF9160DK_NRF9160_NS
 
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

applications/asset_tracker_v2/boards/nrf9160dk_nrf9160_ns.overlay

@@ -41,17 +41,4 @@
  label = "Green LED 4";
  };
  };
-
- /* Configure partition manager to use mx25r64 as the external flash */
- chosen {
- nordic,pm-ext-flash = &mx25r64;
- };
-
- aliases {
- ext-flash = &mx25r64;
- };
-};
-
-&mx25r64 {
- status = "okay";
 };

applications/asset_tracker_v2/doc/asset_tracker_v2_description.rst

@@ -107,7 +107,7 @@ The application provides predefined configuration files for typical use cases.
 Following are the available configuration files:
 
 * :file:`prj.conf` - Configuration file for all build targets.
-* :file:`boards/<BOARD>.conf` - Configuration file specific for a build target specified with **<BOARD>**, where **<BOARD>** is the build target, for example ``nrf9161dk_nrf9161_ns``.
+* :file:`boards/<BOARD>.conf` - Configuration file specific for a build target specified with **<BOARD>**, where **<BOARD>** is the build target, for example ``nrf9161dk/nrf9161/ns``.
  This file is automatically merged with the :file:`prj.conf` file when you build for that target.
 
 The :file:`include/<BOARD>/led_state_def.h` header file describes the LED behavior of the CAF LEDs module.

applications/asset_tracker_v2/doc/cloud_module.rst

@@ -99,7 +99,7 @@ This application implements full modem FOTA for the nRF91x1 DKs and for the nRF9
 To enable full modem FOTA, add the ``-DEXTRA_CONF_FILE=overlay-full_modem_fota.conf`` parameter to your build command.
 
 Also, specify your development kit version by appending it to the board name.
-For example, if your development kit version is 1.0.1, use the board name ``nrf9160dk_nrf9160_ns@1_0_1`` in your build command.
+For example, if your development kit version is 1.0.1, use the board name ``nrf9160dk@1.0.1/nrf9160/ns`` in your build command.
 
 Connection awareness
 ====================