Skip to content

Commit 0982e74

Browse files
butokjukkar
authored andcommitted
[nrf fromtree] yaml: use EXTRA_CONF_FILE in .yaml files
Use EXTRA_CONF_FILE in sample yaml files, that replaced deprecated OVERLAY_CONFIG since the Zephyr v3.4 release. Signed-off-by: Andrej Butok <[email protected]> (cherry picked from commit e53eec0)
1 parent 8d80b67 commit 0982e74

File tree

47 files changed

+145
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+145
-145
lines changed

samples/drivers/jesd216/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tests:
2424
sample.drivers.jesd216.nrf52840dk_spi:
2525
extra_args:
2626
- DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay
27-
- OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf
27+
- EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf
2828
platform_allow: nrf52840dk/nrf52840
2929
integration_platforms:
3030
- nrf52840dk/nrf52840

samples/drivers/spi_flash_at45/sample.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ tests:
99
filter: dt_compat_enabled("atmel,at45")
1010
build_only: true
1111
sample.drivers.spi.flash.at45.build.page_layout:
12-
extra_args: OVERLAY_CONFIG="overlay-page_layout.conf"
12+
extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf"
1313
tags:
1414
- spi
1515
- flash
1616
depends_on: spi
1717
filter: dt_compat_enabled("atmel,at45")
1818
build_only: true
1919
sample.drivers.spi.flash.at45.build.pm:
20-
extra_args: OVERLAY_CONFIG="overlay-pm.conf"
20+
extra_args: EXTRA_CONF_FILE="overlay-pm.conf"
2121
tags:
2222
- spi
2323
- flash
2424
depends_on: spi
2525
filter: dt_compat_enabled("atmel,at45")
2626
build_only: true
2727
sample.drivers.spi.flash.at45.build.page_layout_pm:
28-
extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf"
28+
extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
2929
tags:
3030
- spi
3131
- flash
3232
depends_on: spi
3333
filter: dt_compat_enabled("atmel,at45")
3434
build_only: true
3535
sample.drivers.spi.flash.at45:
36-
extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf"
36+
extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf"
3737
tags:
3838
- spi
3939
- flash

samples/modules/thrift/hello/client/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tests:
2121
extra_configs:
2222
- CONFIG_THRIFT_COMPACT_PROTOCOL=y
2323
sample.thrift.hello.client.tlsTransport:
24-
extra_args: OVERLAY_CONFIG="../overlay-tls.conf"
24+
extra_args: EXTRA_CONF_FILE="../overlay-tls.conf"

samples/modules/thrift/hello/server/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tests:
2121
extra_configs:
2222
- CONFIG_THRIFT_COMPACT_PROTOCOL=y
2323
sample.thrift.hello.server.tlsTransport:
24-
extra_args: OVERLAY_CONFIG="../overlay-tls.conf"
24+
extra_args: EXTRA_CONF_FILE="../overlay-tls.conf"

samples/net/cloud/tagoio_http_post/sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ tests:
1818
integration_platforms:
1919
- frdm_k64f
2020
sample.net.cloud.tagoio_http_post.wifi:
21-
extra_args: OVERLAY_CONFIG="overlay-wifi.conf"
21+
extra_args: EXTRA_CONF_FILE="overlay-wifi.conf"
2222
platform_allow: disco_l475_iot1
2323
sample.net.cloud.tagoio_http_post.wifi.esp:
2424
extra_args:
2525
- SHIELD=esp_8266_arduino
26-
- OVERLAY_CONFIG="overlay-wifi.conf"
26+
- EXTRA_CONF_FILE="overlay-wifi.conf"
2727
platform_allow:
2828
- frdm_k64f
2929
- nucleo_f767zi

samples/net/lwm2m_client/sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ tests:
4040
sample.net.lwm2m_client.dtls:
4141
harness: net
4242
depends_on: netif
43-
extra_args: OVERLAY_CONFIG=overlay-dtls.conf
43+
extra_args: EXTRA_CONF_FILE=overlay-dtls.conf
4444
platform_allow:
4545
- qemu_x86
4646
- frdm_k64f
@@ -55,7 +55,7 @@ tests:
5555
sample.net.lwm2m_client.queue_mode:
5656
harness: net
5757
depends_on: netif
58-
extra_args: OVERLAY_CONFIG=overlay-queue.conf
58+
extra_args: EXTRA_CONF_FILE=overlay-queue.conf
5959
platform_allow:
6060
- qemu_x86
6161
- native_sim

samples/net/openthread/coprocessor/sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ tests:
2626
- nrf52840dk/nrf52840
2727
tags: ci_build
2828
extra_args:
29-
- OVERLAY_CONFIG=overlay-usb-nrf-br.conf
29+
- EXTRA_CONF_FILE=overlay-usb-nrf-br.conf
3030
- DTC_OVERLAY_FILE="usb.overlay"
3131
sample.openthread.coprocessor.rcp:
3232
build_only: true
@@ -36,4 +36,4 @@ tests:
3636
- tlsr9518adk80d
3737
integration_platforms:
3838
- nrf52840dk/nrf52840
39-
extra_args: OVERLAY_CONFIG=overlay-rcp.conf
39+
extra_args: EXTRA_CONF_FILE=overlay-rcp.conf

samples/net/secure_mqtt_sensor_actuator/sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tests:
1212
- adi_eval_adin1110ebz
1313
sample.net.secure_mqtt_sensor_actuator.staticip:
1414
harness: net
15-
extra_args: OVERLAY_CONFIG="overlay-static.conf"
15+
extra_args: EXTRA_CONF_FILE="overlay-static.conf"
1616
tags:
1717
- net
1818
- mqtt
@@ -22,7 +22,7 @@ tests:
2222
- native_sim
2323
sample.net.secure_mqtt_sensor_actuator.staticip_insecure:
2424
harness: net
25-
extra_args: OVERLAY_CONFIG="overlay-static-insecure.conf"
25+
extra_args: EXTRA_CONF_FILE="overlay-static-insecure.conf"
2626
tags:
2727
- net
2828
- mqtt

samples/net/sockets/big_http_download/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ tests:
1818
extra_configs:
1919
- CONFIG_POSIX_API=y
2020
sample.net.sockets.big_http_download.ci:
21-
extra_args: OVERLAY_CONFIG=overlay-ci.conf
21+
extra_args: EXTRA_CONF_FILE=overlay-ci.conf

samples/net/sockets/dumb_http_server/sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tests:
1717
sample.net.sockets.dumb_http_server.netusb:
1818
depends_on: usb_device
1919
harness: net
20-
extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
20+
extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
2121
tags: usb
2222
# native_sim usb driver does not work with CONFIG_POSIX_API
2323
platform_exclude:
@@ -28,7 +28,7 @@ tests:
2828
sample.net.sockets.dumb_http_server.netusb_zeroconf:
2929
depends_on: usb_device
3030
harness: net
31-
extra_args: OVERLAY_CONFIG="overlay-netusb.conf;overlay-zeroconf.conf"
31+
extra_args: EXTRA_CONF_FILE="overlay-netusb.conf;overlay-zeroconf.conf"
3232
tags: usb
3333
# native_sim usb driver does not work with CONFIG_POSIX_API
3434
platform_exclude:

0 commit comments

Comments
 (0)