From ce331eacdae2a8590cceae09d0927733b0119148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Fri, 15 Nov 2024 15:28:06 +0100 Subject: [PATCH 01/11] [nrf fromlist] modules: hal_nordic: nrfs: Optimize communication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not needed to use always the system work queue to send a message over IPC. In thread context IPC service can be called directly. It speeds up the communication and allows to use nrfs from the system work queue. Legacy approach could easily lead to the deadlock if user would call nrfs from work queue and pend on semaphore until response is received. Upstream PR #: 81455 Signed-off-by: Krzysztof Chruściński --- modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c index 129098e9b2d..bf5dec9fe16 100644 --- a/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c +++ b/modules/hal_nordic/nrfs/backends/nrfs_backend_ipc_service.c @@ -176,7 +176,10 @@ nrfs_err_t nrfs_backend_send(void *message, size_t size) nrfs_err_t nrfs_backend_send_ex(void *message, size_t size, k_timeout_t timeout, bool high_prio) { - if (size <= MAX_PACKET_DATA_SIZE) { + if (!k_is_in_isr() && nrfs_backend_connected()) { + return ipc_service_send(&ipc_cpusys_channel_config.ipc_ept, message, size) ? + NRFS_SUCCESS : NRFS_ERR_IPC; + } else if (size <= MAX_PACKET_DATA_SIZE) { int err; struct ipc_data_packet tx_data; From c09639b4fe00199846c9581b5300a5ceaf244a8f Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Fri, 13 Dec 2024 12:53:09 +0100 Subject: [PATCH 02/11] Revert "[nrf fromlist] tests: drivers: spi: nordic: add device PM runtime" This reverts commit 21246912543a9e8c13f635021ffea00f5d3de9da. Signed-off-by: Nikodem Kastelik --- .../boards/nrf52840dk_nrf52840.overlay | 2 -- .../boards/nrf54h20dk_nrf54h20_common.dtsi | 1 - .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay | 1 - .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 2 -- tests/drivers/spi/spi_controller_peripheral/testcase.yaml | 6 ------ .../spi/spi_loopback/boards/nrf51dk_nrf51822.overlay | 1 - .../spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay | 1 - .../spi/spi_loopback/boards/nrf52dk_nrf52832.overlay | 1 - .../spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 1 - .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay | 1 - .../spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 1 - .../spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay | 1 - tests/drivers/spi/spi_loopback/testcase.yaml | 5 ----- 13 files changed, 24 deletions(-) diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay index 91cd073041e..97802a7a637 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay @@ -50,11 +50,9 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; - spi-max-frequency = ; }; }; diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi index d431933ab5a..8661760a5e3 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi @@ -60,7 +60,6 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index 4441819249f..0523426db45 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -55,7 +55,6 @@ overrun-character = <0x00>; memory-regions = <&dma_fast_region>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 0188a2c4e24..73a50a7c6fc 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -54,11 +54,9 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; - spi-max-frequency = ; }; }; diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml index 51a503e9231..675259a4dd0 100644 --- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml +++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml @@ -57,9 +57,3 @@ tests: - nrf52840dk/nrf52840 - nrf54l15dk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad - - drivers.spi.pm_runtime: - extra_configs: - - CONFIG_PM_DEVICE=y - - CONFIG_PM_DEVICE_RUNTIME=y - filter: CONFIG_SOC_FAMILY_NORDIC_NRF diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay index 06a0d63816a..812f643f3e8 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay @@ -7,7 +7,6 @@ &spi1 { overrun-character = <0x00>; cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay index 7de4d8d6322..7f511d0753d 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay @@ -8,7 +8,6 @@ overrun-character = <0x00>; rx-delay = <1>; cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay index 06a0d63816a..812f643f3e8 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay @@ -7,7 +7,6 @@ &spi1 { overrun-character = <0x00>; cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 6743e1d0933..89e5fbad08a 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -30,7 +30,6 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; memory-regions = <&cpuapp_dma_region>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index 2857c48f6fb..d6c3c972afd 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -30,7 +30,6 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; memory-regions = <&dma_fast_region>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 8dcf6fd190d..f2e84b72f9b 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -29,7 +29,6 @@ pinctrl-1 = <&spi00_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay index bcd2472166a..a07ed5fbf5d 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay @@ -7,7 +7,6 @@ &spi3 { overrun-character = <0x00>; cs-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; - zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index c65ec904d37..5760aa0d879 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -204,8 +204,3 @@ tests: drivers.spi.max32_dma.loopback: extra_args: OVERLAY_CONFIG="overlay-max32-spi-dma.conf" filter: CONFIG_SOC_FAMILY_MAX32 - drivers.spi.nrf_pm_runtime: - extra_configs: - - CONFIG_PM_DEVICE=y - - CONFIG_PM_DEVICE_RUNTIME=y - filter: CONFIG_SOC_FAMILY_NORDIC_NRF From 2e60f2636260452a6619ea3caf53ec9a674696bf Mon Sep 17 00:00:00 2001 From: Nikodem Kastelik Date: Fri, 13 Dec 2024 12:53:57 +0100 Subject: [PATCH 03/11] Revert "[nrf fromlist] drivers: spi: nrfx_spim: Add support for device runtime PM" This reverts commit 22632c9c7cd4c56118e9f1f7495e67d814320ec0. Signed-off-by: Nikodem Kastelik --- drivers/spi/spi_nrfx_spim.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index aacf863e3b4..b0eecc07625 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -91,9 +90,6 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact if (NRF_SPIM_IS_320MHZ_SPIM(reg) && !(dev_data->ctx.config->operation & SPI_HOLD_ON_CS)) { nrfy_spim_disable(reg); } - if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) { - pm_device_runtime_put(dev); - } } static inline uint32_t get_nrf_spim_frequency(uint32_t frequency) @@ -464,9 +460,6 @@ static int transceive(const struct device *dev, void *reg = dev_config->spim.p_reg; int error; - if (IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)) { - pm_device_runtime_get(dev); - } spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg); error = configure(dev, spi_cfg); @@ -578,20 +571,21 @@ static const struct spi_driver_api spi_nrfx_driver_api = { .release = spi_nrfx_release, }; +#ifdef CONFIG_PM_DEVICE static int spim_nrfx_pm_action(const struct device *dev, enum pm_device_action action) { - int ret = -ENOTSUP; + int ret = 0; struct spi_nrfx_data *dev_data = dev->data; const struct spi_nrfx_config *dev_config = dev->config; switch (action) { - case PM_DEVICE_ACTION_TURN_ON: - ret = 0; - break; case PM_DEVICE_ACTION_RESUME: ret = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT); + if (ret < 0) { + return ret; + } /* nrfx_spim_init() will be called at configuration before * the next transfer. */ @@ -614,14 +608,19 @@ static int spim_nrfx_pm_action(const struct device *dev, ret = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP); + if (ret < 0) { + return ret; + } break; default: - break; + ret = -ENOTSUP; } return ret; } +#endif /* CONFIG_PM_DEVICE */ + static int spi_nrfx_init(const struct device *dev) { @@ -656,12 +655,10 @@ static int spi_nrfx_init(const struct device *dev) spi_context_unlock_unconditionally(&dev_data->ctx); #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58 - err = anomaly_58_workaround_init(dev); - if (err < 0) { - return err; - } + return anomaly_58_workaround_init(dev); +#else + return 0; #endif - return pm_device_driver_init(dev, spim_nrfx_pm_action); } /* * We use NODELABEL here because the nrfx API requires us to call From 9ea6a7b7fed023ca068a37fe8b652b2aee7ee99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Mon, 24 Jun 2024 10:55:11 +0200 Subject: [PATCH 04/11] [nrf fromtree] tests: drivers: spi: spi_controller_peripheral: Add nrf54h20dk cpuppr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rework existing nrf54h20dk overlays to allow adding of nrf54h20dk//cpuppr target. Signed-off-by: Krzysztof Chruściński (cherry picked from commit 949566f829631d1b1f4fdaa93acdd0d1ac1ce0a0) --- .../boards/nrf54h20dk_nrf54h20_cpuppr.overlay | 6 ++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 16 ++++++++++++++++ .../sysbuild/vpr_launcher/prj.conf | 1 + .../spi/spi_controller_peripheral/testcase.yaml | 5 +++-- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay create mode 100644 tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay new file mode 100644 index 00000000000..83d3121c189 --- /dev/null +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuppr.overlay @@ -0,0 +1,6 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include "nrf54h20dk_nrf54h20_common.dtsi" diff --git a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 00000000000..4343187f21f --- /dev/null +++ b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include "../../../boards/nrf54h20dk_nrf54h20_common.dtsi" + +&spi130 { + status = "reserved"; + interrupt-parent = <&cpuppr_clic>; +}; + +&dut_spis { + status = "reserved"; + interrupt-parent = <&cpuppr_clic>; +}; diff --git a/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf new file mode 100644 index 00000000000..b2a4ba59104 --- /dev/null +++ b/tests/drivers/spi/spi_controller_peripheral/sysbuild/vpr_launcher/prj.conf @@ -0,0 +1 @@ +# nothing here diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml index 675259a4dd0..e55a6a6a69d 100644 --- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml +++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml @@ -5,8 +5,8 @@ common: harness_config: fixture: gpio_spi_loopback platform_allow: | - nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp nrf54h20dk/nrf54h20/cpurad + nrf52840dk/nrf52840 nrf54l15dk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp + nrf54h20dk/nrf54h20/cpurad nrf54h20dk/nrf54h20/cpuppr tests: drivers.spi.spi_mode0: @@ -57,3 +57,4 @@ tests: - nrf52840dk/nrf52840 - nrf54l15dk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad + - nrf54h20dk/nrf54h20/cpuppr From 1999638c9ab46dd8b43d0b0addd0a306ec6670ec Mon Sep 17 00:00:00 2001 From: Ayush Singh Date: Tue, 8 Oct 2024 20:42:35 +0530 Subject: [PATCH 05/11] [nrf fromtree] samples: net: sockets: echo_server: Add 802154-subg test - Using beagleconnect freedom for testing subg overlay Signed-off-by: Ayush Singh (cherry picked from commit 40d8926b20e5fa065bc3f694b5925ec0c1d86b59) --- samples/net/sockets/echo_server/sample.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml index b1f2b6009e2..949b34e9cbb 100644 --- a/samples/net/sockets/echo_server/sample.yaml +++ b/samples/net/sockets/echo_server/sample.yaml @@ -142,3 +142,6 @@ tests: - native_sim/native/64 extra_args: - OVERLAY_CONFIG="overlay-nsos.conf" + sample.net.sockets.echo_server.802154.subg: + extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf" + platform_allow: beagleconnect_freedom From 20a41d81d84ebc71cef75579c3db7055d2ab2c63 Mon Sep 17 00:00:00 2001 From: Andrej Butok Date: Mon, 7 Oct 2024 15:05:24 +0200 Subject: [PATCH 06/11] [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 (cherry picked from commit e53eec08512e083e5e22e4874541e800a4e54e95) --- samples/drivers/jesd216/sample.yaml | 2 +- samples/drivers/spi_flash_at45/sample.yaml | 8 ++--- .../modules/thrift/hello/client/sample.yaml | 2 +- .../modules/thrift/hello/server/sample.yaml | 2 +- .../net/cloud/tagoio_http_post/sample.yaml | 4 +-- samples/net/lwm2m_client/sample.yaml | 4 +-- .../net/openthread/coprocessor/sample.yaml | 4 +-- .../secure_mqtt_sensor_actuator/sample.yaml | 4 +-- .../net/sockets/big_http_download/sample.yaml | 2 +- .../net/sockets/dumb_http_server/sample.yaml | 4 +-- samples/net/sockets/echo_client/sample.yaml | 28 +++++++-------- samples/net/sockets/echo_server/sample.yaml | 36 +++++++++---------- samples/net/sockets/http_get/sample.yaml | 4 +-- samples/net/zperf/sample.yaml | 8 ++--- samples/subsys/fs/fs_sample/sample.yaml | 6 ++-- samples/subsys/fs/littlefs/sample.yaml | 14 ++++---- samples/subsys/logging/logger/sample.yaml | 2 +- samples/subsys/logging/syst/sample.yaml | 10 +++--- .../subsys/mgmt/mcumgr/smp_svr/sample.yaml | 20 +++++------ samples/subsys/mgmt/updatehub/sample.yaml | 4 +-- samples/subsys/modbus/rtu_server/sample.yaml | 2 +- samples/subsys/shell/devmem_load/sample.yaml | 2 +- samples/subsys/shell/shell_module/sample.yaml | 4 +-- samples/subsys/usb/dfu/sample.yaml | 2 +- .../mcuboot_recovery_retention/testcase.yaml | 2 +- tests/crypto/secp256r1/testcase.yaml | 6 ++-- tests/drivers/adc/adc_api/testcase.yaml | 6 ++-- tests/drivers/bbram/testcase.yaml | 4 +-- tests/drivers/build_all/sensor/testcase.yaml | 12 +++---- tests/drivers/eeprom/api/testcase.yaml | 2 +- tests/drivers/entropy/api/testcase.yaml | 4 +-- tests/drivers/flash/common/testcase.yaml | 14 ++++---- tests/drivers/retained_mem/api/testcase.yaml | 2 +- tests/drivers/spi/spi_loopback/testcase.yaml | 22 ++++++------ .../drivers/uart/uart_basic_api/testcase.yaml | 2 +- .../watchdog/wdt_basic_api/testcase.yaml | 2 +- tests/lib/gui/lvgl/testcase.yaml | 2 +- tests/modules/thrift/ThriftTest/testcase.yaml | 2 +- tests/net/lib/tls_credentials/testcase.yaml | 2 +- tests/subsys/dfu/img_util/testcase.yaml | 2 +- .../logging/log_switch_format/testcase.yaml | 6 ++-- .../mgmt/mcumgr/all_options/testcase.yaml | 2 +- .../fs_mgmt_hash_supported/testcase.yaml | 6 ++-- .../mgmt/mcumgr/handler_demo/testcase.yaml | 2 +- tests/subsys/pm/power_mgmt/testcase.yaml | 2 +- .../settings/functional/nvs/testcase.yaml | 2 +- tests/subsys/storage/flash_map/testcase.yaml | 6 ++-- 47 files changed, 145 insertions(+), 145 deletions(-) diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml index c2742a68d46..afc3b200554 100644 --- a/samples/drivers/jesd216/sample.yaml +++ b/samples/drivers/jesd216/sample.yaml @@ -24,7 +24,7 @@ tests: sample.drivers.jesd216.nrf52840dk_spi: extra_args: - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf platform_allow: nrf52840dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 diff --git a/samples/drivers/spi_flash_at45/sample.yaml b/samples/drivers/spi_flash_at45/sample.yaml index 2195f6f7756..c362fa5a693 100644 --- a/samples/drivers/spi_flash_at45/sample.yaml +++ b/samples/drivers/spi_flash_at45/sample.yaml @@ -9,7 +9,7 @@ tests: filter: dt_compat_enabled("atmel,at45") build_only: true sample.drivers.spi.flash.at45.build.page_layout: - extra_args: OVERLAY_CONFIG="overlay-page_layout.conf" + extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf" tags: - spi - flash @@ -17,7 +17,7 @@ tests: filter: dt_compat_enabled("atmel,at45") build_only: true sample.drivers.spi.flash.at45.build.pm: - extra_args: OVERLAY_CONFIG="overlay-pm.conf" + extra_args: EXTRA_CONF_FILE="overlay-pm.conf" tags: - spi - flash @@ -25,7 +25,7 @@ tests: filter: dt_compat_enabled("atmel,at45") build_only: true sample.drivers.spi.flash.at45.build.page_layout_pm: - extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf" + extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf" tags: - spi - flash @@ -33,7 +33,7 @@ tests: filter: dt_compat_enabled("atmel,at45") build_only: true sample.drivers.spi.flash.at45: - extra_args: OVERLAY_CONFIG="overlay-page_layout.conf;overlay-pm.conf" + extra_args: EXTRA_CONF_FILE="overlay-page_layout.conf;overlay-pm.conf" tags: - spi - flash diff --git a/samples/modules/thrift/hello/client/sample.yaml b/samples/modules/thrift/hello/client/sample.yaml index 6a1ef0caecd..319d49a506d 100644 --- a/samples/modules/thrift/hello/client/sample.yaml +++ b/samples/modules/thrift/hello/client/sample.yaml @@ -21,4 +21,4 @@ tests: extra_configs: - CONFIG_THRIFT_COMPACT_PROTOCOL=y sample.thrift.hello.client.tlsTransport: - extra_args: OVERLAY_CONFIG="../overlay-tls.conf" + extra_args: EXTRA_CONF_FILE="../overlay-tls.conf" diff --git a/samples/modules/thrift/hello/server/sample.yaml b/samples/modules/thrift/hello/server/sample.yaml index 02bfe323d01..eca296a8a1c 100644 --- a/samples/modules/thrift/hello/server/sample.yaml +++ b/samples/modules/thrift/hello/server/sample.yaml @@ -21,4 +21,4 @@ tests: extra_configs: - CONFIG_THRIFT_COMPACT_PROTOCOL=y sample.thrift.hello.server.tlsTransport: - extra_args: OVERLAY_CONFIG="../overlay-tls.conf" + extra_args: EXTRA_CONF_FILE="../overlay-tls.conf" diff --git a/samples/net/cloud/tagoio_http_post/sample.yaml b/samples/net/cloud/tagoio_http_post/sample.yaml index 08a67c0343a..6265708da27 100644 --- a/samples/net/cloud/tagoio_http_post/sample.yaml +++ b/samples/net/cloud/tagoio_http_post/sample.yaml @@ -18,12 +18,12 @@ tests: integration_platforms: - frdm_k64f sample.net.cloud.tagoio_http_post.wifi: - extra_args: OVERLAY_CONFIG="overlay-wifi.conf" + extra_args: EXTRA_CONF_FILE="overlay-wifi.conf" platform_allow: disco_l475_iot1 sample.net.cloud.tagoio_http_post.wifi.esp: extra_args: - SHIELD=esp_8266_arduino - - OVERLAY_CONFIG="overlay-wifi.conf" + - EXTRA_CONF_FILE="overlay-wifi.conf" platform_allow: - frdm_k64f - nucleo_f767zi diff --git a/samples/net/lwm2m_client/sample.yaml b/samples/net/lwm2m_client/sample.yaml index f70290d287e..5c8f0eb7f11 100644 --- a/samples/net/lwm2m_client/sample.yaml +++ b/samples/net/lwm2m_client/sample.yaml @@ -40,7 +40,7 @@ tests: sample.net.lwm2m_client.dtls: harness: net depends_on: netif - extra_args: OVERLAY_CONFIG=overlay-dtls.conf + extra_args: EXTRA_CONF_FILE=overlay-dtls.conf platform_allow: - qemu_x86 - frdm_k64f @@ -55,7 +55,7 @@ tests: sample.net.lwm2m_client.queue_mode: harness: net depends_on: netif - extra_args: OVERLAY_CONFIG=overlay-queue.conf + extra_args: EXTRA_CONF_FILE=overlay-queue.conf platform_allow: - qemu_x86 - native_sim diff --git a/samples/net/openthread/coprocessor/sample.yaml b/samples/net/openthread/coprocessor/sample.yaml index aa917223de9..26487beb0f3 100644 --- a/samples/net/openthread/coprocessor/sample.yaml +++ b/samples/net/openthread/coprocessor/sample.yaml @@ -26,7 +26,7 @@ tests: - nrf52840dk/nrf52840 tags: ci_build extra_args: - - OVERLAY_CONFIG=overlay-usb-nrf-br.conf + - EXTRA_CONF_FILE=overlay-usb-nrf-br.conf - DTC_OVERLAY_FILE="usb.overlay" sample.openthread.coprocessor.rcp: build_only: true @@ -36,4 +36,4 @@ tests: - tlsr9518adk80d integration_platforms: - nrf52840dk/nrf52840 - extra_args: OVERLAY_CONFIG=overlay-rcp.conf + extra_args: EXTRA_CONF_FILE=overlay-rcp.conf diff --git a/samples/net/secure_mqtt_sensor_actuator/sample.yaml b/samples/net/secure_mqtt_sensor_actuator/sample.yaml index 44b9a4d7d2a..f970f9a53d7 100644 --- a/samples/net/secure_mqtt_sensor_actuator/sample.yaml +++ b/samples/net/secure_mqtt_sensor_actuator/sample.yaml @@ -12,7 +12,7 @@ tests: - adi_eval_adin1110ebz sample.net.secure_mqtt_sensor_actuator.staticip: harness: net - extra_args: OVERLAY_CONFIG="overlay-static.conf" + extra_args: EXTRA_CONF_FILE="overlay-static.conf" tags: - net - mqtt @@ -22,7 +22,7 @@ tests: - native_sim sample.net.secure_mqtt_sensor_actuator.staticip_insecure: harness: net - extra_args: OVERLAY_CONFIG="overlay-static-insecure.conf" + extra_args: EXTRA_CONF_FILE="overlay-static-insecure.conf" tags: - net - mqtt diff --git a/samples/net/sockets/big_http_download/sample.yaml b/samples/net/sockets/big_http_download/sample.yaml index d27f131836d..0851eeffec0 100644 --- a/samples/net/sockets/big_http_download/sample.yaml +++ b/samples/net/sockets/big_http_download/sample.yaml @@ -18,4 +18,4 @@ tests: extra_configs: - CONFIG_POSIX_API=y sample.net.sockets.big_http_download.ci: - extra_args: OVERLAY_CONFIG=overlay-ci.conf + extra_args: EXTRA_CONF_FILE=overlay-ci.conf diff --git a/samples/net/sockets/dumb_http_server/sample.yaml b/samples/net/sockets/dumb_http_server/sample.yaml index 53fe319293d..7e076a94eb1 100644 --- a/samples/net/sockets/dumb_http_server/sample.yaml +++ b/samples/net/sockets/dumb_http_server/sample.yaml @@ -17,7 +17,7 @@ tests: sample.net.sockets.dumb_http_server.netusb: depends_on: usb_device harness: net - extra_args: OVERLAY_CONFIG="overlay-netusb.conf" + extra_args: EXTRA_CONF_FILE="overlay-netusb.conf" tags: usb # native_sim usb driver does not work with CONFIG_POSIX_API platform_exclude: @@ -28,7 +28,7 @@ tests: sample.net.sockets.dumb_http_server.netusb_zeroconf: depends_on: usb_device harness: net - extra_args: OVERLAY_CONFIG="overlay-netusb.conf;overlay-zeroconf.conf" + extra_args: EXTRA_CONF_FILE="overlay-netusb.conf;overlay-zeroconf.conf" tags: usb # native_sim usb driver does not work with CONFIG_POSIX_API platform_exclude: diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml index 2f3d58fb81c..b10777df087 100644 --- a/samples/net/sockets/echo_client/sample.yaml +++ b/samples/net/sockets/echo_client/sample.yaml @@ -19,20 +19,20 @@ tests: integration_platforms: - qemu_x86 sample.net.sockets.echo_client.802154: - extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-qemu_802154.conf" platform_allow: qemu_x86 sample.net.sockets.echo_client.802154.rf2xx: - extra_args: OVERLAY_CONFIG="overlay-802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: samr21_xpro sample.net.sockets.echo_client.802154.rf2xx.xplained: extra_args: - SHIELD=atmel_rf2xx_xplained - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: sam4s_xplained sample.net.sockets.echo_client.802154.rf2xx.xpro: extra_args: - SHIELD=atmel_rf2xx_xpro - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: - sam4e_xpro - sam_v71_xult/samv71q21 @@ -41,7 +41,7 @@ tests: sample.net.sockets.echo_client.802154.rf2xx.legacy: extra_args: - SHIELD=atmel_rf2xx_legacy - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: - sam4e_xpro - sam_v71_xult/samv71q21 @@ -50,7 +50,7 @@ tests: sample.net.sockets.echo_client.802154.rf2xx.arduino: extra_args: - SHIELD=atmel_rf2xx_arduino - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: - sam_v71_xult/samv71q21 - frdm_k64f @@ -60,18 +60,18 @@ tests: sample.net.sockets.echo_client.802154.rf2xx.mikrobus: extra_args: - SHIELD=atmel_rf2xx_mikrobus - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns sample.net.sockets.echo_client.mcr20a: extra_args: - SHIELD=frdm_cr20a - - OVERLAY_CONFIG=overlay-802154.conf + - EXTRA_CONF_FILE=overlay-802154.conf platform_allow: frdm_k64f sample.net.sockets.echo_client.nrf_802154: - extra_args: OVERLAY_CONFIG="overlay-802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: nrf52840dk/nrf52840 sample.net.sockets.echo_client.nrf_openthread: - extra_args: OVERLAY_CONFIG="overlay-ot.conf" + extra_args: EXTRA_CONF_FILE="overlay-ot.conf" slow: true tags: - net @@ -79,10 +79,10 @@ tests: platform_allow: nrf52840dk/nrf52840 filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC sample.net.sockets.echo_client.b91_802154: - extra_args: OVERLAY_CONFIG="overlay-802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: tlsr9518adk80d sample.net.sockets.echo_client.b91_openthread: - extra_args: OVERLAY_CONFIG="overlay-ot.conf" + extra_args: EXTRA_CONF_FILE="overlay-ot.conf" slow: true tags: - net @@ -90,7 +90,7 @@ tests: platform_allow: tlsr9518adk80d filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC sample.net.sockets.echo_client.kw41z_openthread: - extra_args: OVERLAY_CONFIG="overlay-ot.conf" + extra_args: EXTRA_CONF_FILE="overlay-ot.conf" slow: true tags: - net @@ -100,7 +100,7 @@ tests: sample.net.sockets.echo_client.userspace: extra_args: - CONFIG_USERSPACE=y - - OVERLAY_CONFIG="overlay-e1000.conf" + - EXTRA_CONF_FILE="overlay-e1000.conf" platform_allow: - qemu_x86 - qemu_x86_64 diff --git a/samples/net/sockets/echo_server/sample.yaml b/samples/net/sockets/echo_server/sample.yaml index 949b34e9cbb..224221a4f8b 100644 --- a/samples/net/sockets/echo_server/sample.yaml +++ b/samples/net/sockets/echo_server/sample.yaml @@ -22,19 +22,19 @@ tests: integration_platforms: - qemu_x86 sample.net.sockets.echo_server.802154: - extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-qemu_802154.conf" platform_allow: qemu_x86 integration_platforms: - qemu_x86 sample.net.sockets.echo_server.802154.rf2xx.xplained: extra_args: - SHIELD=atmel_rf2xx_xplained - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: sam4s_xplained sample.net.sockets.echo_server.802154.rf2xx.xpro: extra_args: - SHIELD=atmel_rf2xx_xpro - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: - sam4e_xpro - sam_v71_xult/samv71q21 @@ -43,7 +43,7 @@ tests: sample.net.sockets.echo_server.802154.rf2xx.legacy: extra_args: - SHIELD=atmel_rf2xx_legacy - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: - sam4e_xpro - sam_v71_xult/samv71q21 @@ -52,7 +52,7 @@ tests: sample.net.sockets.echo_server.802154.rf2xx.arduino: extra_args: - SHIELD=atmel_rf2xx_arduino - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: - sam_v71_xult/samv71q21 - frdm_k64f @@ -62,23 +62,23 @@ tests: sample.net.sockets.echo_server.802154.rf2xx.mikrobus: extra_args: - SHIELD=atmel_rf2xx_mikrobus - - OVERLAY_CONFIG="overlay-802154.conf" + - EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: lpcxpresso55s69/lpc55s69/cpu0/ns sample.net.sockets.echo_server.mcr20a: extra_args: - SHIELD=frdm_cr20a - - OVERLAY_CONFIG=overlay-802154.conf + - EXTRA_CONF_FILE=overlay-802154.conf platform_allow: frdm_k64f sample.net.sockets.echo_server.nrf_802154: - extra_args: OVERLAY_CONFIG="overlay-802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: nrf52840dk/nrf52840 sample.net.sockets.echo_server.b91_802154: - extra_args: OVERLAY_CONFIG="overlay-802154.conf" + extra_args: EXTRA_CONF_FILE="overlay-802154.conf" platform_allow: tlsr9518adk80d sample.net.sockets.echo_server.usbnet: depends_on: usb_device harness: net - extra_args: OVERLAY_CONFIG="overlay-netusb.conf" + extra_args: EXTRA_CONF_FILE="overlay-netusb.conf" tags: - net - usb @@ -89,7 +89,7 @@ tests: - native_posix - native_posix/native/64 sample.net.sockets.echo_server.nrf_openthread: - extra_args: OVERLAY_CONFIG="overlay-ot.conf" + extra_args: EXTRA_CONF_FILE="overlay-ot.conf" slow: true tags: - net @@ -97,7 +97,7 @@ tests: platform_allow: nrf52840dk/nrf52840 filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC sample.net.sockets.echo_server.b91_openthread: - extra_args: OVERLAY_CONFIG="overlay-ot.conf" + extra_args: EXTRA_CONF_FILE="overlay-ot.conf" slow: true tags: - net @@ -105,7 +105,7 @@ tests: platform_allow: tlsr9518adk80d filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC sample.net.sockets.echo_server.kw41z_openthread: - extra_args: OVERLAY_CONFIG="overlay-ot.conf" + extra_args: EXTRA_CONF_FILE="overlay-ot.conf" slow: true tags: - net @@ -113,23 +113,23 @@ tests: platform_allow: frdm_kw41z filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC sample.net.sockets.echo_server.e1000: - extra_args: OVERLAY_CONFIG="overlay-e1000.conf" + extra_args: EXTRA_CONF_FILE="overlay-e1000.conf" tags: net platform_allow: - qemu_x86 - qemu_x86_64 sample.net.sockets.echo_server.stellaris: - extra_args: OVERLAY_CONFIG="overlay-qemu_cortex_m3_eth.conf" + extra_args: EXTRA_CONF_FILE="overlay-qemu_cortex_m3_eth.conf" tags: net platform_allow: qemu_cortex_m3 sample.net.sockets.echo_server.smsc911x: - extra_args: OVERLAY_CONFIG="overlay-smsc911x.conf" + extra_args: EXTRA_CONF_FILE="overlay-smsc911x.conf" tags: net platform_allow: mps2/an385 sample.net.sockets.echo_server.userspace: extra_args: - CONFIG_USERSPACE=y - - OVERLAY_CONFIG="overlay-e1000.conf" + - EXTRA_CONF_FILE="overlay-e1000.conf" - CONFIG_MAX_THREAD_BYTES=3 platform_allow: - qemu_x86 @@ -141,7 +141,7 @@ tests: - native_sim - native_sim/native/64 extra_args: - - OVERLAY_CONFIG="overlay-nsos.conf" + - EXTRA_CONF_FILE="overlay-nsos.conf" sample.net.sockets.echo_server.802154.subg: extra_args: EXTRA_CONF_FILE="overlay-802154-subg.conf" platform_allow: beagleconnect_freedom diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml index 292058bfce9..8e94ffaf341 100644 --- a/samples/net/sockets/http_get/sample.yaml +++ b/samples/net/sockets/http_get/sample.yaml @@ -43,7 +43,7 @@ tests: platform_allow: - native_sim - native_sim/native/64 - extra_args: OVERLAY_CONFIG="overlay-nsos.conf" + extra_args: EXTRA_CONF_FILE="overlay-nsos.conf" sample.net.sockets.http_get.nsos.https: harness: console harness_config: @@ -56,7 +56,7 @@ tests: platform_allow: - native_sim - native_sim/native/64 - extra_args: OVERLAY_CONFIG="overlay-nsos.conf;overlay-tls.conf" + extra_args: EXTRA_CONF_FILE="overlay-nsos.conf;overlay-tls.conf" sample.net.sockets.http_get.wifi.nrf70dk: extra_args: - SNIPPET=wifi-ipv4 diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml index 35260fd723a..3c5e30bb47b 100644 --- a/samples/net/zperf/sample.yaml +++ b/samples/net/zperf/sample.yaml @@ -34,7 +34,7 @@ tests: platform_allow: qemu_x86 sample.net.zperf.netusb_ecm: harness: net - extra_args: OVERLAY_CONFIG="overlay-netusb.conf" + extra_args: EXTRA_CONF_FILE="overlay-netusb.conf" tags: - usb - net @@ -48,14 +48,14 @@ tests: - native_posix/native/64 sample.net.zperf.device_next_ecm: harness: net - extra_args: OVERLAY_CONFIG="overlay-usbd_next_ecm.conf" + extra_args: EXTRA_CONF_FILE="overlay-usbd_next_ecm.conf" DTC_OVERLAY_FILE="usbd_next_ecm.overlay" platform_allow: nrf52840dk/nrf52840 frdm_k64f tags: usb net zperf depends_on: usb_device sample.net.zperf.netusb_eem: harness: net - extra_args: OVERLAY_CONFIG="overlay-netusb.conf" + extra_args: EXTRA_CONF_FILE="overlay-netusb.conf" extra_configs: - CONFIG_USB_DEVICE_NETWORK_ECM=n - CONFIG_USB_DEVICE_NETWORK_EEM=y @@ -72,7 +72,7 @@ tests: - native_posix/native/64 sample.net.zperf.netusb_rndis: harness: net - extra_args: OVERLAY_CONFIG="overlay-netusb.conf" + extra_args: EXTRA_CONF_FILE="overlay-netusb.conf" extra_configs: - CONFIG_USB_DEVICE_NETWORK_ECM=n - CONFIG_USB_DEVICE_NETWORK_RNDIS=y diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml index b16976876be..91c0fe100b4 100644 --- a/samples/subsys/fs/fs_sample/sample.yaml +++ b/samples/subsys/fs/fs_sample/sample.yaml @@ -47,13 +47,13 @@ tests: build_only: true platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_ram_disk.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk.overlay sample.filesystem.fat_fs.nrf52840dk_nrf52840_ram_disk_region: build_only: true platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_ram_disk.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_ram_disk.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_ram_disk_region.overlay sample.filesystem.fat_fs.nrf54l15dk: build_only: true @@ -62,7 +62,7 @@ tests: build_only: true platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay sample.filesystem.fat_fs.has_sdmmc_disk: build_only: true diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml index 2160d38515e..ea62b0103ca 100644 --- a/samples/subsys/fs/littlefs/sample.yaml +++ b/samples/subsys/fs/littlefs/sample.yaml @@ -40,19 +40,19 @@ tests: build_only: true platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_spi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_spi.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_spi.overlay sample.filesystem.littlefs.nrf52840dk_qspi: build_only: true platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay sample.filesystem.littlefs.stm32h747i_disco_m7_blk: build_only: true platform_allow: stm32h747i_disco/stm32h747xx/m7 extra_args: - - OVERLAY_CONFIG=boards/stm32_blk.conf + - EXTRA_CONF_FILE=boards/stm32_blk.conf - CONF_FILE=prj_blk.conf extra_configs: - CONFIG_SDMMC_STM32_HWFC=y @@ -60,23 +60,23 @@ tests: build_only: true platform_allow: nucleo_h743zi extra_args: - - OVERLAY_CONFIG=boards/nucleo_h743zi_qspi.conf + - EXTRA_CONF_FILE=boards/nucleo_h743zi_qspi.conf sample.filesystem.littlefs.nucleo_h743zi_blk: build_only: true platform_allow: nucleo_h743zi extra_args: - - OVERLAY_CONFIG=boards/nucleo_h743zi_blk.conf + - EXTRA_CONF_FILE=boards/nucleo_h743zi_blk.conf - CONF_FILE=prj_blk.conf sample.filesystem.littlefs.stm32l562e_dk_ospi: build_only: true platform_allow: stm32l562e_dk extra_args: - - OVERLAY_CONFIG=boards/stm32l562e_dk_ospi.conf + - EXTRA_CONF_FILE=boards/stm32l562e_dk_ospi.conf sample.filesystem.littlefs.stm32f746g_disco_blk: build_only: true platform_allow: stm32f746g_disco extra_args: - - OVERLAY_CONFIG=boards/stm32_blk.conf + - EXTRA_CONF_FILE=boards/stm32_blk.conf - CONF_FILE=prj_blk.conf extra_configs: - CONFIG_SDMMC_STM32_HWFC=y diff --git a/samples/subsys/logging/logger/sample.yaml b/samples/subsys/logging/logger/sample.yaml index 9801f6177c2..38c94026394 100644 --- a/samples/subsys/logging/logger/sample.yaml +++ b/samples/subsys/logging/logger/sample.yaml @@ -42,7 +42,7 @@ tests: arch_exclude: - posix extra_args: - - OVERLAY_CONFIG="overlay-bt.conf" + - EXTRA_CONF_FILE="overlay-bt.conf" - DTC_OVERLAY_FILE="bt.overlay" sample.logger.usermode: diff --git a/samples/subsys/logging/syst/sample.yaml b/samples/subsys/logging/syst/sample.yaml index 8c4681c4fe8..828c4fa33bd 100644 --- a/samples/subsys/logging/syst/sample.yaml +++ b/samples/subsys/logging/syst/sample.yaml @@ -17,7 +17,7 @@ tests: integration_platforms: - mps2/an385 - qemu_x86 - extra_args: OVERLAY_CONFIG=overlay_deferred.conf + extra_args: EXTRA_CONF_FILE=overlay_deferred.conf harness: console harness_config: type: multi_line @@ -35,7 +35,7 @@ tests: - CONFIG_REQUIRES_FULL_LIBC=y sample.logger.syst.immediate: toolchain_exclude: xcc - extra_args: OVERLAY_CONFIG=overlay_immediate.conf + extra_args: EXTRA_CONF_FILE=overlay_immediate.conf integration_platforms: - qemu_x86 - sam_e70_xplained/same70q21 @@ -50,7 +50,7 @@ tests: - CONFIG_REQUIRES_FULL_LIBC=y sample.logger.syst.catalog.deferred: toolchain_exclude: xcc - extra_args: OVERLAY_CONFIG=overlay_deferred.conf + extra_args: EXTRA_CONF_FILE=overlay_deferred.conf integration_platforms: - qemu_x86 - qemu_x86_64 @@ -79,7 +79,7 @@ tests: filter: CONFIG_FULL_LIBC_SUPPORTED sample.logger.syst.deferred_cpp: toolchain_exclude: xcc - extra_args: OVERLAY_CONFIG=overlay_deferred.conf + extra_args: EXTRA_CONF_FILE=overlay_deferred.conf integration_platforms: - qemu_x86 - qemu_x86_64 @@ -108,7 +108,7 @@ tests: filter: CONFIG_FULL_LIBC_SUPPORTED sample.logger.syst.catalog.deferred_cpp: toolchain_exclude: xcc - extra_args: OVERLAY_CONFIG=overlay_deferred.conf + extra_args: EXTRA_CONF_FILE=overlay_deferred.conf integration_platforms: - qemu_x86 - qemu_x86_64 diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml index 33b37512615..ec4d3fb7b08 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml +++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml @@ -6,7 +6,7 @@ common: tags: bluetooth tests: sample.mcumgr.smp_svr.bt: - extra_args: OVERLAY_CONFIG="overlay-bt.conf" + extra_args: EXTRA_CONF_FILE="overlay-bt.conf" platform_allow: - nrf52dk/nrf52832 - nrf52840dk/nrf52840 @@ -19,7 +19,7 @@ tests: - nrf52840dk/nrf52840 - nrf54l15dk/nrf54l15/cpuapp sample.mcumgr.smp_svr.bt_static_svc: - extra_args: OVERLAY_CONFIG="overlay-bt.conf" + extra_args: EXTRA_CONF_FILE="overlay-bt.conf" extra_configs: - CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=n platform_allow: @@ -29,13 +29,13 @@ tests: integration_platforms: - nrf52840dk/nrf52840 sample.mcumgr.smp_svr.udp: - extra_args: OVERLAY_CONFIG="overlay-udp.conf" + extra_args: EXTRA_CONF_FILE="overlay-udp.conf" platform_allow: frdm_k64f integration_platforms: - frdm_k64f sample.mcumgr.smp_svr.cdc: extra_args: - - OVERLAY_CONFIG="overlay-cdc.conf" + - EXTRA_CONF_FILE="overlay-cdc.conf" - DTC_OVERLAY_FILE="usb.overlay" platform_allow: - nrf52833dk/nrf52820 @@ -49,7 +49,7 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp sample.mcumgr.smp_svr.serial: - extra_args: OVERLAY_CONFIG="overlay-serial.conf" + extra_args: EXTRA_CONF_FILE="overlay-serial.conf" platform_allow: - nrf52840dk/nrf52840 - pinnacle_100_dvk @@ -60,7 +60,7 @@ tests: # transport. Transport does not affect flags so it does not really matter which is selected, # flags should affect any transport the same way. sample.mcumgr.smp_svr.mcuboot_flags.direct_xip_withrevert: - extra_args: OVERLAY_CONFIG="overlay-serial.conf" + extra_args: EXTRA_CONF_FILE="overlay-serial.conf" extra_configs: - CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT=y platform_allow: @@ -70,7 +70,7 @@ tests: integration_platforms: - nrf52840dk/nrf52840 sample.mcumgr.smp_svr.serial-console: - extra_args: OVERLAY_CONFIG="overlay-serial-console.conf" + extra_args: EXTRA_CONF_FILE="overlay-serial-console.conf" platform_allow: - nrf52840dk/nrf52840 - pinnacle_100_dvk @@ -78,7 +78,7 @@ tests: integration_platforms: - nrf52840dk/nrf52840 sample.mcumgr.smp_svr.shell: - extra_args: OVERLAY_CONFIG="overlay-shell.conf" + extra_args: EXTRA_CONF_FILE="overlay-shell.conf" platform_allow: - nrf52840dk/nrf52840 - mimxrt1060_evk @@ -90,7 +90,7 @@ tests: - mimxrt1060_evk - mimxrt1064_evk sample.mcumgr.smp_svr.shell_mgmt: - extra_args: OVERLAY_CONFIG="overlay-shell-mgmt.conf" + extra_args: EXTRA_CONF_FILE="overlay-shell-mgmt.conf" platform_allow: - nrf52840dk/nrf52840 - pinnacle_100_dvk @@ -98,7 +98,7 @@ tests: integration_platforms: - nrf52840dk/nrf52840 sample.mcumgr.smp_svr.fs: - extra_args: OVERLAY_CONFIG="overlay-fs.conf" + extra_args: EXTRA_CONF_FILE="overlay-fs.conf" platform_allow: - nrf52840dk/nrf52840 - pinnacle_100_dvk diff --git a/samples/subsys/mgmt/updatehub/sample.yaml b/samples/subsys/mgmt/updatehub/sample.yaml index de8192d957e..161cdb41327 100644 --- a/samples/subsys/mgmt/updatehub/sample.yaml +++ b/samples/subsys/mgmt/updatehub/sample.yaml @@ -20,7 +20,7 @@ tests: - CONFIG_UPDATEHUB_CE=y - CONFIG_UPDATEHUB_SERVER="updatehub.io" sample.net.updatehub.psa: - extra_args: OVERLAY_CONFIG="overlay-psa.conf" + extra_args: EXTRA_CONF_FILE="overlay-psa.conf" extra_configs: - CONFIG_UPDATEHUB_PRODUCT_UID="e4d37cfe6ec48a2d069cc0bbb8b078677e9a0d8df3a027c4d8ea131130c4265f" - CONFIG_UPDATEHUB_POLL_INTERVAL=1 @@ -34,7 +34,7 @@ tests: - CONFIG_UPDATEHUB_SERVER="updatehub.io" - CONFIG_USERSPACE=y sample.net.updatehub.dtls: - extra_args: OVERLAY_CONFIG="overlay-dtls.conf" + extra_args: EXTRA_CONF_FILE="overlay-dtls.conf" extra_configs: - CONFIG_UPDATEHUB_PRODUCT_UID="e4d37cfe6ec48a2d069cc0bbb8b078677e9a0d8df3a027c4d8ea131130c4265f" - CONFIG_UPDATEHUB_POLL_INTERVAL=1 diff --git a/samples/subsys/modbus/rtu_server/sample.yaml b/samples/subsys/modbus/rtu_server/sample.yaml index 76f1eba7f44..f69d51f4eeb 100644 --- a/samples/subsys/modbus/rtu_server/sample.yaml +++ b/samples/subsys/modbus/rtu_server/sample.yaml @@ -31,6 +31,6 @@ tests: dt_enabled_alias_with_parent_compat("led1", "gpio-leds") and dt_enabled_alias_with_parent_compat("led2", "gpio-leds") extra_args: - - OVERLAY_CONFIG="overlay-cdc-acm.conf" + - EXTRA_CONF_FILE="overlay-cdc-acm.conf" - DTC_OVERLAY_FILE="cdc-acm.overlay" depends_on: usb_device diff --git a/samples/subsys/shell/devmem_load/sample.yaml b/samples/subsys/shell/devmem_load/sample.yaml index 2d59490a0eb..e4702ca5a96 100644 --- 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: OVERLAY_CONFIG="prj_poll.conf" + extra_args: EXTRA_CONF_FILE="prj_poll.conf" sample.devmem_load.uart.interrupt: integration_platforms: - frdm_k64f diff --git a/samples/subsys/shell/shell_module/sample.yaml b/samples/subsys/shell/shell_module/sample.yaml index 62f9b30af0f..46c7fbb127f 100644 --- a/samples/subsys/shell/shell_module/sample.yaml +++ b/samples/subsys/shell/shell_module/sample.yaml @@ -22,7 +22,7 @@ tests: harness: keyboard min_ram: 40 extra_args: - - OVERLAY_CONFIG="overlay-usb.conf" + - EXTRA_CONF_FILE="overlay-usb.conf" - DTC_OVERLAY_FILE="usb.overlay" integration_platforms: - native_sim @@ -62,7 +62,7 @@ tests: arch_exclude: - posix extra_args: - - OVERLAY_CONFIG="overlay-bt.conf" + - EXTRA_CONF_FILE="overlay-bt.conf" - DTC_OVERLAY_FILE="bt.overlay" sample.shell.shell_module.login: filter: CONFIG_SERIAL and dt_chosen_enabled("zephyr,shell-uart") diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml index 1700b087473..122a8f63c7f 100644 --- a/samples/subsys/usb/dfu/sample.yaml +++ b/samples/subsys/usb/dfu/sample.yaml @@ -32,4 +32,4 @@ tests: tags: usb sample.usb.dfu.permanent.download: tags: usb - extra_args: OVERLAY_CONFIG=overlay-permanent-download.conf + extra_args: EXTRA_CONF_FILE=overlay-permanent-download.conf diff --git a/tests/boot/mcuboot_recovery_retention/testcase.yaml b/tests/boot/mcuboot_recovery_retention/testcase.yaml index 8ec7fa47496..f8d872d7a9f 100644 --- a/tests/boot/mcuboot_recovery_retention/testcase.yaml +++ b/tests/boot/mcuboot_recovery_retention/testcase.yaml @@ -30,7 +30,7 @@ tests: bootloader.mcuboot.recovery.retention.mem: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf" + - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_mem.conf" - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay" - mcuboot_TARGET_OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_mem.conf" - mcuboot_TARGET_DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_mem.overlay" diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml index 70de8a787b2..0e21e0d86b5 100644 --- a/tests/crypto/secp256r1/testcase.yaml +++ b/tests/crypto/secp256r1/testcase.yaml @@ -10,8 +10,8 @@ common: - p256-m tests: crypto.secp256r1.mbedtls: - extra_args: OVERLAY_CONFIG=mbedtls.conf + extra_args: EXTRA_CONF_FILE=mbedtls.conf crypto.secp256r1.p256-m_raw: - extra_args: OVERLAY_CONFIG=p256-m_raw.conf + extra_args: EXTRA_CONF_FILE=p256-m_raw.conf crypto.secp256r1.tinycrypt: - extra_args: OVERLAY_CONFIG=tinycrypt.conf + extra_args: EXTRA_CONF_FILE=tinycrypt.conf diff --git a/tests/drivers/adc/adc_api/testcase.yaml b/tests/drivers/adc/adc_api/testcase.yaml index 96a24ba2259..8227a92bec8 100644 --- a/tests/drivers/adc/adc_api/testcase.yaml +++ b/tests/drivers/adc/adc_api/testcase.yaml @@ -14,7 +14,7 @@ tests: - b_u585i_iot02a drivers.adc.dma_st_stm32: extra_args: - - OVERLAY_CONFIG="overlay-dma-stm32.conf" + - EXTRA_CONF_FILE="overlay-dma-stm32.conf" depends_on: - adc - dma @@ -41,7 +41,7 @@ tests: - stm32h573i_dk drivers.adc.dma_nxp_kinetis: extra_args: - - OVERLAY_CONFIG="overlay-dma-kinetis.conf" + - EXTRA_CONF_FILE="overlay-dma-kinetis.conf" depends_on: - adc - dma @@ -53,7 +53,7 @@ tests: - frdm_k82f drivers.adc.dma_espressif: extra_args: - - OVERLAY_CONFIG="overlay-dma-esp32.conf" + - EXTRA_CONF_FILE="overlay-dma-esp32.conf" depends_on: - adc - dma diff --git a/tests/drivers/bbram/testcase.yaml b/tests/drivers/bbram/testcase.yaml index 88debe7ab31..f9ff3da2310 100644 --- a/tests/drivers/bbram/testcase.yaml +++ b/tests/drivers/bbram/testcase.yaml @@ -18,13 +18,13 @@ tests: integration_platforms: - npcx9m6f_evb drivers.bbram.stm32: - extra_args: OVERLAY_CONFIG="stm32.conf" + extra_args: EXTRA_CONF_FILE="stm32.conf" filter: dt_compat_enabled("st,stm32-bbram") integration_platforms: - nucleo_g071rb - stm32f746g_disco drivers.bbram.stm32_rtc: - extra_args: OVERLAY_CONFIG="stm32_rtc.conf" + extra_args: EXTRA_CONF_FILE="stm32_rtc.conf" filter: dt_compat_enabled("st,stm32-bbram") integration_platforms: - nucleo_g071rb diff --git a/tests/drivers/build_all/sensor/testcase.yaml b/tests/drivers/build_all/sensor/testcase.yaml index 7fc17df202b..a02e59e1195 100644 --- a/tests/drivers/build_all/sensor/testcase.yaml +++ b/tests/drivers/build_all/sensor/testcase.yaml @@ -10,18 +10,18 @@ common: build_only: true tests: sensors.build.sensorhub: - extra_args: OVERLAY_CONFIG=sensors_shub.conf;sensors_die_temp.conf + extra_args: EXTRA_CONF_FILE=sensors_shub.conf;sensors_die_temp.conf sensors.build.trigger.own: - extra_args: OVERLAY_CONFIG=sensors_trigger_own.conf;sensors_die_temp.conf + extra_args: EXTRA_CONF_FILE=sensors_trigger_own.conf;sensors_die_temp.conf sensors.build.trigger.global: - extra_args: OVERLAY_CONFIG=sensors_trigger_global.conf;sensors_die_temp.conf + extra_args: EXTRA_CONF_FILE=sensors_trigger_global.conf;sensors_die_temp.conf sensors.build.trigger.none: - extra_args: OVERLAY_CONFIG=sensors_trigger_none.conf;sensors_die_temp.conf + extra_args: EXTRA_CONF_FILE=sensors_trigger_none.conf;sensors_die_temp.conf sensors.build.no_default: - extra_args: OVERLAY_CONFIG=sensors_no_default.conf + extra_args: EXTRA_CONF_FILE=sensors_no_default.conf sensors.build: tags: sensors - extra_args: OVERLAY_CONFIG=sensors_die_temp.conf + extra_args: EXTRA_CONF_FILE=sensors_die_temp.conf extra_configs: - CONFIG_UART_INTERRUPT_DRIVEN=y sensors.build.pm: diff --git a/tests/drivers/eeprom/api/testcase.yaml b/tests/drivers/eeprom/api/testcase.yaml index 3f2032b6305..f91021b0e95 100644 --- a/tests/drivers/eeprom/api/testcase.yaml +++ b/tests/drivers/eeprom/api/testcase.yaml @@ -20,7 +20,7 @@ tests: # Tests overwrite EEPROM content, only run on select boards extra_args: - DTC_OVERLAY_FILE=at2x_emul.overlay - - OVERLAY_CONFIG=at2x_emul.conf + - EXTRA_CONF_FILE=at2x_emul.conf platform_allow: - native_posix - native_posix/native/64 diff --git a/tests/drivers/entropy/api/testcase.yaml b/tests/drivers/entropy/api/testcase.yaml index f875cadab42..d0e7532aa47 100644 --- a/tests/drivers/entropy/api/testcase.yaml +++ b/tests/drivers/entropy/api/testcase.yaml @@ -10,7 +10,7 @@ tests: - nrf5340bsim/nrf5340/cpunet extra_args: - DTC_OVERLAY_FILE=./entropy_bt_hci.overlay - - OVERLAY_CONFIG=./entropy_bt_hci.conf + - EXTRA_CONF_FILE=./entropy_bt_hci.conf tags: - driver - entropy @@ -19,7 +19,7 @@ tests: filter: CONFIG_BUILD_WITH_TFM extra_args: - DTC_OVERLAY_FILE=./entropy_psa_crypto.overlay - - OVERLAY_CONFIG=./entropy_psa_crypto.conf + - EXTRA_CONF_FILE=./entropy_psa_crypto.conf tags: - driver - entropy diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml index 5c8e755dc4d..9ee460f6ed2 100644 --- a/tests/drivers/flash/common/testcase.yaml +++ b/tests/drivers/flash/common/testcase.yaml @@ -5,20 +5,20 @@ common: tests: drivers.flash.common.nrf_qspi_nor: platform_allow: nrf52840dk/nrf52840 - extra_args: OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf + extra_args: EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf integration_platforms: - nrf52840dk/nrf52840 drivers.flash.common.nrf_qspi_nor.size_in_bytes: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf - DTC_OVERLAY_FILE=boards/nrf52840_size_in_bytes.overlay integration_platforms: - nrf52840dk/nrf52840 drivers.flash.common.nrf_qspi_nor_4B_addr: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_qspi_nor.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_qspi_nor.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_mx25l51245g.overlay harness_config: fixture: external_flash_mx25l51245g @@ -26,7 +26,7 @@ tests: - nrf52840dk/nrf52840 drivers.flash.common.soc_flash_nrf: platform_allow: nrf52840dk/nrf52840 - extra_args: OVERLAY_CONFIG=boards/nrf52840dk_nrf52840_soc.conf + extra_args: EXTRA_CONF_FILE=boards/nrf52840dk_nrf52840_soc.conf integration_platforms: - nrf52840dk/nrf52840 drivers.flash.common.default: @@ -73,7 +73,7 @@ tests: drivers.flash.common.mx25r_high_perf: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_mx25r_high_perf.overlay integration_platforms: - nrf52840dk/nrf52840 @@ -84,14 +84,14 @@ tests: drivers.flash.common.spi_nor: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_spi_nor.overlay harness_config: fixture: external_flash_mx25v1635f drivers.flash.common.spi_nor_wp_hold: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG=boards/nrf52840dk_flash_spi.conf + - EXTRA_CONF_FILE=boards/nrf52840dk_flash_spi.conf - DTC_OVERLAY_FILE=boards/nrf52840dk_spi_nor_wp_hold.overlay harness_config: fixture: external_flash_mx25v1635f diff --git a/tests/drivers/retained_mem/api/testcase.yaml b/tests/drivers/retained_mem/api/testcase.yaml index f6b6844a1b4..1f2e228ee01 100644 --- a/tests/drivers/retained_mem/api/testcase.yaml +++ b/tests/drivers/retained_mem/api/testcase.yaml @@ -19,7 +19,7 @@ tests: platform_allow: nrf52840dk/nrf52840 extra_args: - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_ram.overlay" - - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_ram.conf" + - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_ram.conf" tags: - drivers - retained_mem diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index 5760aa0d879..47d2ec28178 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -35,12 +35,12 @@ tests: - mimxrt1170_evk/mimxrt1176/cm7 drivers.spi.mcux_dspi_dma.loopback: extra_args: - - OVERLAY_CONFIG="overlay-mcux-dspi-dma.conf" + - EXTRA_CONF_FILE="overlay-mcux-dspi-dma.conf" - DTC_OVERLAY_FILE="overlay-mcux-dspi-dma.overlay" platform_allow: frdm_k64f drivers.spi.sam_spi_dma.loopback: extra_args: - - OVERLAY_CONFIG="overlay-sam-spi-dma.conf" + - EXTRA_CONF_FILE="overlay-sam-spi-dma.conf" - DTC_OVERLAY_FILE="overlay-sam-spi-dma.overlay" platform_allow: - sam_e70_xplained/same70q21 @@ -50,7 +50,7 @@ tests: - sam_e70_xplained/same70q21 drivers.spi.stm32_spi_16bits_frames.loopback: extra_args: - - OVERLAY_CONFIG="overlay-stm32-spi-16bits.conf" + - EXTRA_CONF_FILE="overlay-stm32-spi-16bits.conf" - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay" filter: CONFIG_SOC_FAMILY_STM32 platform_allow: @@ -59,7 +59,7 @@ tests: - nucleo_h745zi_q/stm32h745xx/m4 - nucleo_h745zi_q/stm32h745xx/m7 drivers.spi.stm32_spi_dma.loopback: - extra_args: OVERLAY_CONFIG="overlay-stm32-spi-dma.conf" + extra_args: EXTRA_CONF_FILE="overlay-stm32-spi-dma.conf" filter: CONFIG_SOC_FAMILY_STM32 platform_allow: - b_u585i_iot02a @@ -82,7 +82,7 @@ tests: # this test case is for when nocache memory region is defined in DT # using `zephyr,memory-attr = < DT_MEM_ARM_MPU_RAM_NOCACHE)>` extra_args: - - OVERLAY_CONFIG="overlay-stm32-spi-dma-dt-nocache-mem.conf" + - EXTRA_CONF_FILE="overlay-stm32-spi-dma-dt-nocache-mem.conf" filter: CONFIG_SOC_FAMILY_STM32 and CONFIG_CPU_HAS_DCACHE platform_allow: - nucleo_h743zi @@ -91,7 +91,7 @@ tests: - nucleo_h745zi_q/stm32h745xx/m7 drivers.spi.stm32_spi_16bits_frames_dma.loopback: extra_args: - - OVERLAY_CONFIG="overlay-stm32-spi-16bits-dma.conf" + - EXTRA_CONF_FILE="overlay-stm32-spi-16bits-dma.conf" - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay" filter: CONFIG_SOC_FAMILY_STM32 platform_allow: @@ -101,7 +101,7 @@ tests: - nucleo_h745zi_q/stm32h745xx/m7 drivers.spi.stm32_spi_16bits_frames_dma_dt_nocache_mem.loopback: extra_args: - - OVERLAY_CONFIG="overlay-stm32-spi-16bits-dma-dt-nocache-mem.conf" + - EXTRA_CONF_FILE="overlay-stm32-spi-16bits-dma-dt-nocache-mem.conf" - DTC_OVERLAY_FILE="overlay-stm32-spi-16bits.overlay" filter: CONFIG_SOC_FAMILY_STM32 and CONFIG_CPU_HAS_DCACHE platform_allow: @@ -110,7 +110,7 @@ tests: - nucleo_h745zi_q/stm32h745xx/m4 - nucleo_h745zi_q/stm32h745xx/m7 drivers.spi.stm32_spi_interrupt.loopback: - extra_args: OVERLAY_CONFIG="overlay-stm32-spi-interrupt.conf" + extra_args: EXTRA_CONF_FILE="overlay-stm32-spi-interrupt.conf" filter: CONFIG_SOC_FAMILY_STM32 platform_allow: - b_u585i_iot02a @@ -129,7 +129,7 @@ tests: - stm32f3_disco - stm32h573i_dk drivers.spi.gd32_spi_interrupt.loopback: - extra_args: OVERLAY_CONFIG="overlay-gd32-spi-interrupt.conf" + extra_args: EXTRA_CONF_FILE="overlay-gd32-spi-interrupt.conf" platform_allow: - gd32f403z_eval - gd32f407v_start @@ -142,7 +142,7 @@ tests: - longan_nano - longan_nano/gd32vf103/lite drivers.spi.gd32_spi_dma.loopback: - extra_args: OVERLAY_CONFIG="overlay-gd32-spi-dma.conf" + extra_args: EXTRA_CONF_FILE="overlay-gd32-spi-dma.conf" platform_allow: - gd32f403z_eval - gd32f407v_start @@ -202,5 +202,5 @@ tests: - frdm_ke17z - frdm_ke17z512 drivers.spi.max32_dma.loopback: - extra_args: OVERLAY_CONFIG="overlay-max32-spi-dma.conf" + extra_args: EXTRA_CONF_FILE="overlay-max32-spi-dma.conf" filter: CONFIG_SOC_FAMILY_MAX32 diff --git a/tests/drivers/uart/uart_basic_api/testcase.yaml b/tests/drivers/uart/uart_basic_api/testcase.yaml index 8a6c9210ace..45bb49c04a5 100644 --- a/tests/drivers/uart/uart_basic_api/testcase.yaml +++ b/tests/drivers/uart/uart_basic_api/testcase.yaml @@ -39,7 +39,7 @@ tests: - mps2/an385 drivers.uart.basic_api.cdc_acm: extra_args: - - OVERLAY_CONFIG="overlay-usb.conf" + - EXTRA_CONF_FILE="overlay-usb.conf" - DTC_OVERLAY_FILE="usb.overlay" tags: - drivers diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml index 8736f0c20eb..ce0dd4fe287 100644 --- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml +++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml @@ -80,7 +80,7 @@ tests: drivers.watchdog.counter_watchdog: platform_allow: nrf52840dk/nrf52840 extra_args: - - OVERLAY_CONFIG="boards/nrf52840dk_nrf52840_counter.conf" + - EXTRA_CONF_FILE="boards/nrf52840dk_nrf52840_counter.conf" - DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840_counter.overlay" drivers.watchdog.gd32fwdgt: filter: dt_compat_enabled("gd,gd32-fwdgt") diff --git a/tests/lib/gui/lvgl/testcase.yaml b/tests/lib/gui/lvgl/testcase.yaml index db356ec5569..16533041fac 100644 --- a/tests/lib/gui/lvgl/testcase.yaml +++ b/tests/lib/gui/lvgl/testcase.yaml @@ -84,6 +84,6 @@ tests: - CONFIG_DUMMY_DISPLAY=n extra_args: - SHIELD=st_b_lcd40_dsi1_mb1166 - - OVERLAY_CONFIG=prj_blk.conf + - EXTRA_CONF_FILE=prj_blk.conf tags: - shield diff --git a/tests/modules/thrift/ThriftTest/testcase.yaml b/tests/modules/thrift/ThriftTest/testcase.yaml index 9933f2e3a38..820714408cb 100644 --- a/tests/modules/thrift/ThriftTest/testcase.yaml +++ b/tests/modules/thrift/ThriftTest/testcase.yaml @@ -20,4 +20,4 @@ tests: extra_configs: - CONFIG_THRIFT_COMPACT_PROTOCOL=y thrift.ThriftTest.newlib.tlsTransport: - extra_args: OVERLAY_CONFIG="overlay-tls.conf" + extra_args: EXTRA_CONF_FILE="overlay-tls.conf" diff --git a/tests/net/lib/tls_credentials/testcase.yaml b/tests/net/lib/tls_credentials/testcase.yaml index 2971f1b3b7c..1e812e2164b 100644 --- a/tests/net/lib/tls_credentials/testcase.yaml +++ b/tests/net/lib/tls_credentials/testcase.yaml @@ -6,7 +6,7 @@ tests: depends_on: netif net.tls_credentials.trusted_tfm: filter: CONFIG_BUILD_WITH_TFM - extra_args: OVERLAY_CONFIG=./prj_trusted_tfm.conf + extra_args: EXTRA_CONF_FILE=./prj_trusted_tfm.conf tags: - net - tls diff --git a/tests/subsys/dfu/img_util/testcase.yaml b/tests/subsys/dfu/img_util/testcase.yaml index 54b8de1320e..f0eabc4c4f1 100644 --- a/tests/subsys/dfu/img_util/testcase.yaml +++ b/tests/subsys/dfu/img_util/testcase.yaml @@ -11,5 +11,5 @@ tests: dfu.image_util: tags: dfu_image_util dfu.image_util.progressive: - extra_args: OVERLAY_CONFIG=progressively_overlay.conf + extra_args: EXTRA_CONF_FILE=progressively_overlay.conf tags: dfu_image_util diff --git a/tests/subsys/logging/log_switch_format/testcase.yaml b/tests/subsys/logging/log_switch_format/testcase.yaml index bc1f1e933b7..07540075917 100644 --- a/tests/subsys/logging/log_switch_format/testcase.yaml +++ b/tests/subsys/logging/log_switch_format/testcase.yaml @@ -15,7 +15,7 @@ tests: integration_platforms: - mps2/an385 - qemu_x86 - extra_args: OVERLAY_CONFIG=overlay_deferred.conf + extra_args: EXTRA_CONF_FILE=overlay_deferred.conf # "CONFIG_FULL_LIBC_SUPPORTED" filter was applied # because of following chain of dependencies: # LOG_MIPI_SYST_ENABLE=y --> CONFIG_MIPI_SYST_LIB --> \ @@ -26,7 +26,7 @@ tests: extra_configs: - CONFIG_REQUIRES_FULL_LIBC=y logging.format.switch.immediate: - extra_args: OVERLAY_CONFIG=overlay_immediate.conf + extra_args: EXTRA_CONF_FILE=overlay_immediate.conf integration_platforms: - mps2/an385 - qemu_x86 @@ -34,7 +34,7 @@ tests: extra_configs: - CONFIG_REQUIRES_FULL_LIBC=y logging.format.switch.custom_output: - extra_args: OVERLAY_CONFIG=overlay_custom_output.conf + extra_args: EXTRA_CONF_FILE=overlay_custom_output.conf integration_platforms: - mps2/an385 - qemu_x86 diff --git a/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml b/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml index f21fad9510f..1708d7e7869 100644 --- a/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml +++ b/tests/subsys/mgmt/mcumgr/all_options/testcase.yaml @@ -14,4 +14,4 @@ tests: mgmt.mcumgr.all.options: {} mgmt.mcumgr.all.options.other: extra_args: - - OVERLAY_CONFIG="other-options.conf" + - EXTRA_CONF_FILE="other-options.conf" diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml index b7aeddd6c05..91ba348e02b 100644 --- a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml +++ b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml @@ -21,10 +21,10 @@ common: tests: mgmt.mcumgr.fs.mgmt.hash.supported.crc32: extra_args: > - OVERLAY_CONFIG="configuration/crc32.conf" + EXTRA_CONF_FILE="configuration/crc32.conf" mgmt.mcumgr.fs.mgmt.hash.supported.sha256: extra_args: > - OVERLAY_CONFIG="configuration/sha256.conf" + EXTRA_CONF_FILE="configuration/sha256.conf" mgmt.mcumgr.fs.mgmt.hash.supported.all: extra_args: > - OVERLAY_CONFIG="configuration/all.conf" + EXTRA_CONF_FILE="configuration/all.conf" diff --git a/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml b/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml index dbd18f8d1c5..a4dfe3bc0bd 100644 --- a/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml +++ b/tests/subsys/mgmt/mcumgr/handler_demo/testcase.yaml @@ -18,7 +18,7 @@ tests: build_only: true mgmt.mcumgr.handler.demo.module: extra_args: - - OVERLAY_CONFIG="module.conf" + - EXTRA_CONF_FILE="module.conf" platform_allow: - nrf52840dk/nrf52840 integration_platforms: diff --git a/tests/subsys/pm/power_mgmt/testcase.yaml b/tests/subsys/pm/power_mgmt/testcase.yaml index 8c4a1c92e3d..9f87ac0d666 100644 --- 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: - - OVERLAY_CONFIG="no-device-pm.conf" + - EXTRA_CONF_FILE="no-device-pm.conf" diff --git a/tests/subsys/settings/functional/nvs/testcase.yaml b/tests/subsys/settings/functional/nvs/testcase.yaml index 8abb0039b19..d9f2f8d2f2f 100644 --- a/tests/subsys/settings/functional/nvs/testcase.yaml +++ b/tests/subsys/settings/functional/nvs/testcase.yaml @@ -20,7 +20,7 @@ tests: - settings - nvs settings.functional.nvs.dk: - extra_args: OVERLAY_CONFIG=mpu.conf + extra_args: EXTRA_CONF_FILE=mpu.conf platform_allow: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml index 11c43dcac62..7d4f8ba074a 100644 --- a/tests/subsys/storage/flash_map/testcase.yaml +++ b/tests/subsys/storage/flash_map/testcase.yaml @@ -13,7 +13,7 @@ tests: integration_platforms: - native_sim storage.flash_map.mpu: - extra_args: OVERLAY_CONFIG=overlay-mpu.conf + extra_args: EXTRA_CONF_FILE=overlay-mpu.conf timeout: 120 platform_allow: - nrf52840dk/nrf52840 @@ -25,7 +25,7 @@ tests: - nrf52840dk/nrf52840 tags: flash_map storage.flash_map.mbedtls: - extra_args: OVERLAY_CONFIG=overlay-mbedtls.conf + extra_args: EXTRA_CONF_FILE=overlay-mbedtls.conf platform_allow: - nrf51dk/nrf51822 - qemu_x86 @@ -38,7 +38,7 @@ tests: integration_platforms: - native_sim storage.flash_map.psa: - extra_args: OVERLAY_CONFIG=overlay-psa.conf + extra_args: EXTRA_CONF_FILE=overlay-psa.conf platform_allow: - nrf51dk/nrf51822 - native_posix From 7a02471854b08847c80caa715f89b36ea2ecfce3 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Van Date: Thu, 29 Aug 2024 19:02:07 +0700 Subject: [PATCH 07/11] [nrf fromtree] tests: drivers: spi: enable test spi_loopback enable test spi_loopback for dspi feature on s32z27x devices Signed-off-by: Tu Nguyen Van (cherry picked from commit 55bcc4a57618515845b842961ea79520bee2067d) --- .../boards/s32z2xxdc2_s32z270_dspi.overlay | 40 +++++++++++++++++++ tests/drivers/spi/spi_loopback/testcase.yaml | 6 +++ 2 files changed, 46 insertions(+) create mode 100644 tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay b/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay new file mode 100644 index 00000000000..c6111cbd703 --- /dev/null +++ b/tests/drivers/spi/spi_loopback/boards/s32z2xxdc2_s32z270_dspi.overlay @@ -0,0 +1,40 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&pinctrl { + dspi0_default: dspi0_default { + group1 { + pinmux = , ; + output-enable; + nxp,current-reference-control; + nxp,termination-resistor; + }; + group2 { + pinmux = ; + input-enable; + nxp,current-reference-control; + nxp,termination-resistor; + }; + }; +}; + +&dspi0 { + pinctrl-0 = <&dspi0_default>; + pinctrl-names = "default"; + status = "okay"; + + slow@0 { + compatible = "test-spi-loopback-slow"; + reg = <0>; + spi-max-frequency = <500000>; + }; + + fast@0 { + compatible = "test-spi-loopback-fast"; + reg = <0>; + spi-max-frequency = <16000000>; + }; +}; diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index 47d2ec28178..3087e65c640 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -204,3 +204,9 @@ tests: drivers.spi.max32_dma.loopback: extra_args: EXTRA_CONF_FILE="overlay-max32-spi-dma.conf" filter: CONFIG_SOC_FAMILY_MAX32 + drivers.spi.s32z_dspi.loopback: + extra_args: + - DTC_OVERLAY_FILE=boards/s32z2xxdc2_s32z270_dspi.overlay + platform_allow: + - s32z2xxdc2/s32z270/rtu0 + - s32z2xxdc2/s32z270/rtu1 From 095b656c624d0e821f25542e4ff1808dab13e644 Mon Sep 17 00:00:00 2001 From: Dimitrije Lilic Date: Thu, 12 Sep 2024 15:55:17 +0200 Subject: [PATCH 08/11] [nrf fromtree] tests: drivers: spi: spi_loopback: Support RTIO tests for APARD32690 Add overlay for APARD32690 board and add a new test case to test RTIO functionalities of SPI MAX32 driver. Signed-off-by: Dimitrije Lilic (cherry picked from commit 2507752d7f065f2b93a322bef5ccb8779bfcce4a) --- .../boards/apard32690_max32690_m4.overlay | 19 +++++++++++++++++++ .../spi_loopback/overlay-max32-spi-rtio.conf | 7 +++++++ tests/drivers/spi/spi_loopback/testcase.yaml | 6 ++++++ 3 files changed, 32 insertions(+) create mode 100644 tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay create mode 100644 tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf diff --git a/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay b/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay new file mode 100644 index 00000000000..0a3dbc158db --- /dev/null +++ b/tests/drivers/spi/spi_loopback/boards/apard32690_max32690_m4.overlay @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2024 Analog Devices, Inc. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +arduino_spi: &spi1 { + status = "okay"; + slow@0 { + compatible = "test-spi-loopback-slow"; + reg = <0>; + spi-max-frequency = <128000>; + }; + fast@0 { + compatible = "test-spi-loopback-fast"; + reg = <0>; + spi-max-frequency = <500000>; + }; +}; diff --git a/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf b/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf new file mode 100644 index 00000000000..dcf44166a3b --- /dev/null +++ b/tests/drivers/spi/spi_loopback/overlay-max32-spi-rtio.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2024 Analog Devices, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# +CONFIG_SPI_RTIO=y +CONFIG_SPI_ASYNC=n diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index 3087e65c640..5ed122bfd01 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -210,3 +210,9 @@ tests: platform_allow: - s32z2xxdc2/s32z270/rtu0 - s32z2xxdc2/s32z270/rtu1 + drivers.spi.max32_spi_rtio.loopback: + extra_args: + - OVERLAY_CONFIG="overlay-max32-spi-rtio.conf" + filter: CONFIG_SOC_FAMILY_MAX32 + platform_allow: + - apard32690/max32690/m4 From 29cb8c3b11c38f443ed8c9bf11316b0e4089ccce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Fri, 21 Jun 2024 15:57:14 +0200 Subject: [PATCH 09/11] [nrf fromtree] tests: drivers: spi: spi_loopback: Add nrf54h20dk cpurad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add overlay for nrf54h20dk cpurad. Signed-off-by: Krzysztof Chruściński (cherry picked from commit 20c34ea092d029bcb14a159f9a944852bbf2127a) --- .../boards/nrf54h20dk_nrf54h20_common.dtsi | 49 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 34 +------------ .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 11 +++++ 3 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi create mode 100644 tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi new file mode 100644 index 00000000000..0d31bf6e66e --- /dev/null +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_common.dtsi @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&pinctrl { + spi130_default: spi130_default { + group1 { + psels = , + , + ; + }; + }; + + spi130_sleep: spi130_sleep { + group1 { + psels = , + , + ; + low-power-enable; + }; + }; +}; + +&spi130 { + pinctrl-0 = <&spi130_default>; + pinctrl-1 = <&spi130_sleep>; + pinctrl-names = "default", "sleep"; + overrun-character = <0x00>; + slow@0 { + compatible = "test-spi-loopback-slow"; + reg = <0>; + spi-max-frequency = ; + }; + fast@0 { + compatible = "test-spi-loopback-fast"; + reg = <0>; + spi-max-frequency = ; + }; +}; + +&gpio0 { + status = "okay"; +}; + +&gpiote130 { + status = "okay"; +}; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 89e5fbad08a..e9338612aed 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -3,41 +3,9 @@ * * SPDX-License-Identifier: Apache-2.0 */ - -&pinctrl { - spi130_default: spi130_default { - group1 { - psels = , - , - ; - }; - }; - - spi130_sleep: spi130_sleep { - group1 { - psels = , - , - ; - low-power-enable; - }; - }; -}; +#include "nrf54h20dk_nrf54h20_common.dtsi" &spi130 { status = "okay"; - pinctrl-0 = <&spi130_default>; - pinctrl-1 = <&spi130_sleep>; - pinctrl-names = "default", "sleep"; - overrun-character = <0x00>; memory-regions = <&cpuapp_dma_region>; - slow@0 { - compatible = "test-spi-loopback-slow"; - reg = <0>; - spi-max-frequency = ; - }; - fast@0 { - compatible = "test-spi-loopback-fast"; - reg = <0>; - spi-max-frequency = ; - }; }; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay new file mode 100644 index 00000000000..b94da1560f6 --- /dev/null +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include "nrf54h20dk_nrf54h20_common.dtsi" + +&spi130 { + status = "okay"; + memory-regions = <&cpurad_dma_region>; +}; From d9755bd28d762bbc256398da5d424e236c91818b Mon Sep 17 00:00:00 2001 From: Adam Kondraciuk Date: Tue, 9 Jul 2024 10:02:46 +0200 Subject: [PATCH 10/11] [nrf fromlist] drivers: spi: nrfx_spim: Add support for device runtime PM Enable the device runtime power management on the SPIM shim. Upstream PR #: 75715 Signed-off-by: Adam Kondraciuk Signed-off-by: Nikodem Kastelik --- drivers/spi/spi_nrfx_spim.c | 73 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index b0eecc07625..11ba2e584a1 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -90,6 +91,8 @@ static inline void finalize_spi_transaction(const struct device *dev, bool deact if (NRF_SPIM_IS_320MHZ_SPIM(reg) && !(dev_data->ctx.config->operation & SPI_HOLD_ON_CS)) { nrfy_spim_disable(reg); } + + pm_device_runtime_put_async(dev, K_NO_WAIT); } static inline uint32_t get_nrf_spim_frequency(uint32_t frequency) @@ -460,6 +463,7 @@ static int transceive(const struct device *dev, void *reg = dev_config->spim.p_reg; int error; + pm_device_runtime_get(dev); spi_context_lock(&dev_data->ctx, asynchronous, cb, userdata, spi_cfg); error = configure(dev, spi_cfg); @@ -571,56 +575,49 @@ static const struct spi_driver_api spi_nrfx_driver_api = { .release = spi_nrfx_release, }; -#ifdef CONFIG_PM_DEVICE -static int spim_nrfx_pm_action(const struct device *dev, - enum pm_device_action action) +static void spim_resume(const struct device *dev) { - int ret = 0; - struct spi_nrfx_data *dev_data = dev->data; const struct spi_nrfx_config *dev_config = dev->config; - switch (action) { - case PM_DEVICE_ACTION_RESUME: - ret = pinctrl_apply_state(dev_config->pcfg, - PINCTRL_STATE_DEFAULT); - if (ret < 0) { - return ret; - } - /* nrfx_spim_init() will be called at configuration before - * the next transfer. - */ + (void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_DEFAULT); + /* nrfx_spim_init() will be called at configuration before + * the next transfer. + */ #ifdef CONFIG_SOC_NRF54H20_GPD - nrf_gpd_retain_pins_set(dev_config->pcfg, false); + nrf_gpd_retain_pins_set(dev_config->pcfg, false); #endif +} - break; +static void spim_suspend(const struct device *dev) +{ + const struct spi_nrfx_config *dev_config = dev->config; + struct spi_nrfx_data *dev_data = dev->data; - case PM_DEVICE_ACTION_SUSPEND: - if (dev_data->initialized) { - nrfx_spim_uninit(&dev_config->spim); - dev_data->initialized = false; - } + if (dev_data->initialized) { + nrfx_spim_uninit(&dev_config->spim); + dev_data->initialized = false; + } #ifdef CONFIG_SOC_NRF54H20_GPD - nrf_gpd_retain_pins_set(dev_config->pcfg, true); + nrf_gpd_retain_pins_set(dev_config->pcfg, true); #endif - ret = pinctrl_apply_state(dev_config->pcfg, - PINCTRL_STATE_SLEEP); - if (ret < 0) { - return ret; - } - break; + (void)pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP); +} - default: - ret = -ENOTSUP; +static int spim_nrfx_pm_action(const struct device *dev, enum pm_device_action action) +{ + if (action == PM_DEVICE_ACTION_RESUME) { + spim_resume(dev); + } else if (IS_ENABLED(CONFIG_PM_DEVICE) && (action == PM_DEVICE_ACTION_SUSPEND)) { + spim_suspend(dev); + } else { + return -ENOTSUP; } - return ret; + return 0; } -#endif /* CONFIG_PM_DEVICE */ - static int spi_nrfx_init(const struct device *dev) { @@ -655,10 +652,12 @@ static int spi_nrfx_init(const struct device *dev) spi_context_unlock_unconditionally(&dev_data->ctx); #ifdef CONFIG_SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58 - return anomaly_58_workaround_init(dev); -#else - return 0; + err = anomaly_58_workaround_init(dev); + if (err < 0) { + return err; + } #endif + return pm_device_driver_init(dev, spim_nrfx_pm_action); } /* * We use NODELABEL here because the nrfx API requires us to call From 2a8927cc70398a04706ca5592ffe82381e68172a Mon Sep 17 00:00:00 2001 From: Adam Kondraciuk Date: Fri, 12 Jul 2024 10:50:14 +0200 Subject: [PATCH 11/11] [nrf fromlist] tests: drivers: spi: nordic: add device PM runtime Add configuration for testing SPI with device runtime PM enabled for nRF platforms. Upstream PR #: 75715 Signed-off-by: Adam Kondraciuk Signed-off-by: Nikodem Kastelik --- .../boards/nrf52840dk_nrf52840.overlay | 1 + .../boards/nrf54h20dk_nrf54h20_common.dtsi | 1 + .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay | 1 + .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 2 ++ .../spi/spi_controller_peripheral/testcase.yaml | 6 ++++++ .../spi/spi_loopback/boards/nrf51dk_nrf51822.overlay | 1 + .../spi_loopback/boards/nrf52840dk_nrf52840.overlay | 1 + .../spi/spi_loopback/boards/nrf52dk_nrf52832.overlay | 1 + .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 11 +++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay | 1 + .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 1 + .../spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay | 1 + tests/drivers/spi/spi_loopback/testcase.yaml | 5 +++++ 13 files changed, 33 insertions(+) diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay index 97802a7a637..a1a0dc42a36 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf52840dk_nrf52840.overlay @@ -50,6 +50,7 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi index 8661760a5e3..d431933ab5a 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_common.dtsi @@ -60,6 +60,7 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index 0523426db45..4441819249f 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -55,6 +55,7 @@ overrun-character = <0x00>; memory-regions = <&dma_fast_region>; cs-gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 73a50a7c6fc..0188a2c4e24 100644 --- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -54,9 +54,11 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; cs-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; dut_spi_dt: test-spi-dev@0 { compatible = "vnd,spi-device"; reg = <0>; + spi-max-frequency = ; }; }; diff --git a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml index e55a6a6a69d..41884efcdb5 100644 --- a/tests/drivers/spi/spi_controller_peripheral/testcase.yaml +++ b/tests/drivers/spi/spi_controller_peripheral/testcase.yaml @@ -58,3 +58,9 @@ tests: - nrf54l15dk/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad - nrf54h20dk/nrf54h20/cpuppr + + drivers.spi.pm_runtime: + extra_configs: + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME=y + filter: CONFIG_SOC_FAMILY_NORDIC_NRF diff --git a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay index 812f643f3e8..06a0d63816a 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf51dk_nrf51822.overlay @@ -7,6 +7,7 @@ &spi1 { overrun-character = <0x00>; cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay index 7f511d0753d..7de4d8d6322 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf52840dk_nrf52840.overlay @@ -8,6 +8,7 @@ overrun-character = <0x00>; rx-delay = <1>; cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay index 812f643f3e8..06a0d63816a 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf52dk_nrf52832.overlay @@ -7,6 +7,7 @@ &spi1 { overrun-character = <0x00>; cs-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index e9338612aed..1455ac160b8 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -8,4 +8,15 @@ &spi130 { status = "okay"; memory-regions = <&cpuapp_dma_region>; + zephyr,pm-device-runtime-auto; + slow@0 { + compatible = "test-spi-loopback-slow"; + reg = <0>; + spi-max-frequency = ; + }; + fast@0 { + compatible = "test-spi-loopback-fast"; + reg = <0>; + spi-max-frequency = ; + }; }; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index d6c3c972afd..2857c48f6fb 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -30,6 +30,7 @@ pinctrl-names = "default", "sleep"; overrun-character = <0x00>; memory-regions = <&dma_fast_region>; + zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index f2e84b72f9b..8dcf6fd190d 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -29,6 +29,7 @@ pinctrl-1 = <&spi00_sleep>; pinctrl-names = "default", "sleep"; overrun-character = <0x00>; + zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay index a07ed5fbf5d..bcd2472166a 100644 --- a/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay +++ b/tests/drivers/spi/spi_loopback/boards/nrf9160dk_nrf9160.overlay @@ -7,6 +7,7 @@ &spi3 { overrun-character = <0x00>; cs-gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + zephyr,pm-device-runtime-auto; slow@0 { compatible = "test-spi-loopback-slow"; reg = <0>; diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index 5ed122bfd01..682446401cd 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -216,3 +216,8 @@ tests: filter: CONFIG_SOC_FAMILY_MAX32 platform_allow: - apard32690/max32690/m4 + drivers.spi.nrf_pm_runtime: + extra_configs: + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME=y + filter: CONFIG_SOC_FAMILY_NORDIC_NRF