zephyrproject-rtos · carlescufi · Oct 24, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git a/samples/bluetooth/bap_broadcast_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml
@@ -24,5 +24,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_broadcast_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml
@@ -25,5 +25,5 @@ tests:
       - nrf52_bsim
       - nrf52833dk/nrf52833
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml
@@ -22,5 +22,5 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/bap_unicast_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml
@@ -22,5 +22,5 @@ tests:
       - nrf52840dk/nrf52840
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/cap_acceptor/sample.yaml b/samples/bluetooth/cap_acceptor/sample.yaml
@@ -26,5 +26,5 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/cap_initiator/sample.yaml b/samples/bluetooth/cap_initiator/sample.yaml
@@ -26,5 +26,5 @@ tests:
       - nrf52833dk/nrf52833
       - nrf52840dk/nrf52840
       - nrf52840dongle/nrf52840
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -16,7 +16,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
   sample.bluetooth.direction_finding.central.aod:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-aod.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820

diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_rx/sample.yaml
@@ -14,7 +14,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
   sample.bluetooth.direction_finding_connectionless_rx.aod:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aod.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-aod.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820

diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml b/samples/bluetooth/direction_finding_connectionless_tx/sample.yaml
@@ -14,7 +14,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
   sample.bluetooth.direction_finding_connectionless.aoa:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-aoa.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820

diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -16,7 +16,7 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
   sample.bluetooth.direction_finding.peripheral.aod:
     harness: bluetooth
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-aoa.conf"
     platform_allow:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820

diff --git a/samples/bluetooth/hap_ha/sample.yaml b/samples/bluetooth/hap_ha/sample.yaml
@@ -21,14 +21,14 @@ tests:
     platform_allow:
       - native_sim
     tags: bluetooth
-    extra_args: OVERLAY_CONFIG="banded.conf"
+    extra_args: EXTRA_CONF_FILE="banded.conf"
     build_only: true
   sample.bluetooth.hap_ha.binaural:
     harness: bluetooth
     platform_allow:
       - native_sim
     tags: bluetooth
-    extra_args: OVERLAY_CONFIG="binaural.conf"
+    extra_args: EXTRA_CONF_FILE="binaural.conf"
     build_only: true
     extra_configs:
       - CONFIG_HAP_HA_SET_RANK=2
diff --git a/samples/bluetooth/hci_uart/sample.yaml b/samples/bluetooth/hci_uart/sample.yaml
@@ -82,7 +82,7 @@ tests:
     integration_platforms:
       - nrf52833dk/nrf52833
     extra_args:
-      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
+      - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
     tags:
       - uart
@@ -93,7 +93,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
     extra_args:
-      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
+      - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf54l15dk_nrf54l15_cpuapp_df.overlay
     tags:
       - uart

diff --git a/samples/bluetooth/hci_uart_3wire/sample.yaml b/samples/bluetooth/hci_uart_3wire/sample.yaml
@@ -53,7 +53,7 @@ tests:
     integration_platforms:
       - nrf52833dk/nrf52833
     extra_args:
-      - OVERLAY_CONFIG=overlay-all-bt_ll_sw_split.conf
+      - EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
       - DTC_OVERLAY_FILE=./boards/nrf52833dk_nrf52833_df.overlay
     tags:
       - uart

diff --git a/samples/bluetooth/iso_broadcast/sample.yaml b/samples/bluetooth/iso_broadcast/sample.yaml
@@ -20,5 +20,5 @@ tests:
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/iso_central/sample.yaml b/samples/bluetooth/iso_central/sample.yaml
@@ -17,5 +17,5 @@ tests:
       - nrf52833dk/nrf52833
     integration_platforms:
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/iso_receive/sample.yaml b/samples/bluetooth/iso_receive/sample.yaml
@@ -20,5 +20,5 @@ tests:
       - nrf52dk/nrf52832
     integration_platforms:
       - nrf52dk/nrf52832
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml
@@ -23,5 +23,5 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/pbp_public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml
@@ -23,5 +23,5 @@ tests:
     integration_platforms:
       - nrf52_bsim
       - nrf52833dk/nrf52833
-    extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
+    extra_args: EXTRA_CONF_FILE=overlay-bt_ll_sw_split.conf
     tags: bluetooth
diff --git a/samples/bluetooth/tmap_peripheral/sample.yaml b/samples/bluetooth/tmap_peripheral/sample.yaml
@@ -18,7 +18,7 @@ tests:
       - qemu_x86
       - native_sim
     tags: bluetooth
-    extra_args: OVERLAY_CONFIG="duo.conf"
+    extra_args: EXTRA_CONF_FILE="duo.conf"
     extra_configs:
       - CONFIG_TMAP_PERIPHERAL_SET_RANK=2
     integration_platforms:

diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml
@@ -53,7 +53,7 @@ tests:
     depends_on: usb_device
   sample.net.zperf.device_next_ncm:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-usbd_next.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-usbd_next.conf"
                 DTC_OVERLAY_FILE="usbd_next_ncm.overlay"
     platform_allow: nrf52840dk/nrf52840 frdm_k64f
     tags: usb net zperf

diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
@@ -51,7 +51,7 @@ tests:
     build_only: true
     platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args:
-      - EXTRA_CONF_FILE=boards/stm32_blk.conf
+      - EXTRA_CONF_FILE=stm32_blk.conf
       - CONF_FILE=prj_blk.conf
     extra_configs:
       - CONFIG_SDMMC_STM32_HWFC=y
@@ -75,7 +75,7 @@ tests:
     build_only: true
     platform_allow: stm32f746g_disco
     extra_args:
-      - EXTRA_CONF_FILE=boards/stm32_blk.conf
+      - EXTRA_CONF_FILE=stm32_blk.conf
       - CONF_FILE=prj_blk.conf
     extra_configs:
       - CONFIG_SDMMC_STM32_HWFC=y
diff --git a/.../subsys/fs/littlefs/boards/stm32_blk.conf → samples/subsys/fs/littlefs/stm32_blk.conf b/.../subsys/fs/littlefs/boards/stm32_blk.conf → samples/subsys/fs/littlefs/stm32_blk.conf
diff --git a/samples/subsys/shell/devmem_load/README.md b/samples/subsys/shell/devmem_load/README.md
@@ -20,7 +20,7 @@ west flash
 
 Building for boards without UART interrupt support:
 ```bash
-west build -b native_sim -- -DEXTRA_CONF_FILE=prj_poll.conf  samples/subsys/shell/devmem_load
+west build -b native_sim -- -DCONF_FILE=prj_poll.conf  samples/subsys/shell/devmem_load
 ```
 ## Running
 After connecting to the UART console you should see the following output:

diff --git a/samples/subsys/shell/devmem_load/sample.yaml b/samples/subsys/shell/devmem_load/sample.yaml
@@ -10,7 +10,7 @@ tests:
   sample.devmem_load.polled:
     integration_platforms:
       - native_sim
-    extra_args: EXTRA_CONF_FILE="prj_poll.conf"
+    extra_args: CONF_FILE="prj_poll.conf"
   sample.devmem_load.uart.interrupt:
     integration_platforms:
       - frdm_k64f

diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
@@ -42,7 +42,7 @@ tests:
     build_only: true
   bluetooth.shell.cdc_acm:
     extra_args:
-      - OVERLAY_CONFIG=cdc_acm.conf
+      - EXTRA_CONF_FILE=cdc_acm.conf
       - DTC_OVERLAY_FILE="usb.overlay"
     depends_on: usb_device
     platform_allow:

diff --git a/tests/bluetooth/tester/testcase.yaml b/tests/bluetooth/tester/testcase.yaml
@@ -23,7 +23,7 @@ tests:
       - native_sim
       - nrf5340dk/nrf5340/cpuapp
       - nrf5340_audio_dk/nrf5340/cpuapp
-    extra_args: OVERLAY_CONFIG="overlay-le-audio.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-le-audio.conf"
     tags: bluetooth
     harness: bluetooth
   bluetooth.general.tester_mesh:
@@ -32,6 +32,6 @@ tests:
       - qemu_x86
       - native_sim
       - nrf52840dk/nrf52840
-    extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-mesh.conf"
     tags: bluetooth
     harness: bluetooth
diff --git a/tests/bsim/bluetooth/ll/bis/testcase.yaml b/tests/bsim/bluetooth/ll/bis/testcase.yaml
@@ -19,7 +19,7 @@ tests:
     harness_config:
       bsim_exe_name: tests_bsim_bluetooth_ll_bis_prj_conf
   bluetooth.ll.bis_ticker_expire_info:
-    extra_args: OVERLAY_CONFIG=overlay-ticker_expire_info.conf
+    extra_args: EXTRA_CONF_FILE=overlay-ticker_expire_info.conf
     platform_allow:
       - nrf52_bsim
       - nrf5340bsim/nrf5340/cpunet

diff --git a/tests/subsys/pm/power_mgmt/testcase.yaml b/tests/subsys/pm/power_mgmt/testcase.yaml
@@ -5,4 +5,4 @@ tests:
   pm.system: {}
   pm.system.no.device.pm:
     extra_args:
-      - EXTRA_CONF_FILE="no-device-pm.conf"
+      - CONF_FILE="no-device-pm.conf"