From b9f3d68863b9f75dcc1dfac7dd7ff269b99cd118 Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Fri, 5 Apr 2024 22:12:36 +0200 Subject: [PATCH] samples: tests: additional overlay and conf file adjustments Adjustments of overlay and conf files to adjust for the MERGE removal. The revert of MERGE requires specific overlay and conf files for boards which relied on the MERGE feature. Signed-off-by: Torsten Rasmussen --- ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 .../adc/boards/mimxrt1160_evk_cm7.overlay | 34 ------------- ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 ...rkit.conf => em_starterkit_emsk_em9d.conf} | 0 ...verlay => em_starterkit_emsk_em9d.overlay} | 0 .../{emsdp.conf => emsdp_emsdp_em11d.conf} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 .../lvgl/demos/boards/native_sim_64.overlay | 6 +++ ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ....conf => esp32_devkitc_wrover_procpu.conf} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 .../fxos8700/boards/mimxrt1160_evk_cm4.conf | 2 - .../fxos8700/boards/mimxrt1160_evk_cm7.conf | 2 - ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 .../openamp/boards/mimxrt1160_evk_cm7.conf | 2 - .../openamp/boards/mimxrt1160_evk_cm7.overlay | 24 --------- ..._an521.overlay => mps2_an521_cpu0.overlay} | 0 .../remote/boards/mimxrt1160_evk_cm4.overlay | 51 ------------------- ..._an521.overlay => mps2_an521_cpu0.overlay} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ....conf => esp32_devkitc_wrover_procpu.conf} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 .../adc_api/boards/native_posix_64.overlay | 7 +++ .../adc/adc_api/boards/native_sim_64.overlay | 7 +++ ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 .../boards/mimxrt1160_evk_cm4.conf | 3 -- .../boards/mimxrt1160_evk_cm4.overlay | 14 ----- .../boards/mimxrt1160_evk_cm7.conf | 3 -- .../boards/mimxrt1160_evk_cm7.overlay | 14 ----- .../boards/mimxrt1170_evk_cm4.conf | 4 -- .../boards/mimxrt1170_evk_cm4.overlay | 14 ----- ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 .../boards/mimxrt1160_evk_cm7.overlay | 7 --- .../boards/native_sim_64.overlay | 7 +++ .../boards/mimxrt1160_evk_cm4.conf | 3 -- .../boards/mimxrt1160_evk_cm4.overlay | 14 ----- .../boards/mimxrt1160_evk_cm7.conf | 3 -- .../boards/mimxrt1160_evk_cm7.overlay | 14 ----- .../boards/mimxrt1170_evk_cm4.conf | 3 -- .../boards/mimxrt1170_evk_cm4.overlay | 14 ----- ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...verlay => em_starterkit_emsk_em9d.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...verlay => em_starterkit_emsk_em9d.overlay} | 0 .../{emsdp.conf => emsdp_emsdp_em11d.conf} | 0 ...msdp.overlay => emsdp_emsdp_em11d.overlay} | 0 ...m.conf => esp32_devkitc_wroom_procpu.conf} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 .../boards/mimxrt1160_evk_cm4.overlay | 7 --- .../boards/mimxrt1160_evk_cm7.overlay | 13 ----- .../boards/mimxrt1170_evk_cm4.overlay | 7 --- ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ... => mimxrt685_evk_mimxrt685s_cm33.overlay} | 0 ...lay => esp32_devkitc_wroom_procpu.overlay} | 0 ...ay => esp32_devkitc_wrover_procpu.overlay} | 0 85 files changed, 27 insertions(+), 252 deletions(-) rename samples/basic/blinky_pwm/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/basic/blinky_pwm/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename samples/bluetooth/hci_uart/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename samples/bluetooth/hci_uart/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/boards/esp32/deep_sleep/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename samples/boards/esp32/flash_encryption/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/drivers/adc/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/drivers/adc/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) delete mode 100644 samples/drivers/adc/boards/mimxrt1160_evk_cm7.overlay rename samples/drivers/adc/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename samples/drivers/counter/alarm/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/drivers/dac/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/drivers/dac/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) rename samples/drivers/spi_flash/boards/{em_starterkit.conf => em_starterkit_emsk_em9d.conf} (100%) rename samples/drivers/spi_flash/boards/{em_starterkit.overlay => em_starterkit_emsk_em9d.overlay} (100%) rename samples/drivers/spi_flash/boards/{emsdp.conf => emsdp_emsdp_em11d.conf} (100%) rename samples/drivers/watchdog/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) create mode 100644 samples/modules/lvgl/demos/boards/native_sim_64.overlay rename samples/net/wifi/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename samples/net/wifi/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/net/wifi/boards/{esp32_devkitc_wrover.conf => esp32_devkitc_wrover_procpu.conf} (100%) rename samples/net/wifi/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) delete mode 100644 samples/sensor/fxos8700/boards/mimxrt1160_evk_cm4.conf delete mode 100644 samples/sensor/fxos8700/boards/mimxrt1160_evk_cm7.conf rename samples/sensor/grow_r502a/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/sensor/lps22hh_i3c/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename samples/sensor/lsm6dso_i2c_on_i3c/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename samples/subsys/input/input_dump/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename samples/subsys/input/input_dump/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) delete mode 100644 samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.conf delete mode 100644 samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.overlay rename samples/subsys/ipc/openamp/boards/{mps2_an521.overlay => mps2_an521_cpu0.overlay} (100%) delete mode 100644 samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_cm4.overlay rename samples/subsys/ipc/rpmsg_service/boards/{mps2_an521.overlay => mps2_an521_cpu0.overlay} (100%) rename samples/subsys/nvs/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename samples/subsys/settings/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename tests/drivers/adc/adc_api/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename tests/drivers/adc/adc_api/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/drivers/adc/adc_api/boards/{esp32_devkitc_wrover.conf => esp32_devkitc_wrover_procpu.conf} (100%) rename tests/drivers/adc/adc_api/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) rename tests/drivers/adc/adc_api/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) create mode 100644 tests/drivers/adc/adc_api/boards/native_posix_64.overlay create mode 100644 tests/drivers/adc/adc_api/boards/native_sim_64.overlay rename tests/drivers/counter/counter_basic_api/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/drivers/counter/counter_basic_api/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) rename tests/drivers/dac/dac_api/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/drivers/dac/dac_api/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.conf delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.overlay delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.conf delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.overlay delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.conf delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.overlay rename tests/drivers/dma/chan_blen_transfer/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) delete mode 100644 tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_cm7.overlay create mode 100644 tests/drivers/dma/chan_link_transfer/boards/native_sim_64.overlay delete mode 100644 tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.conf delete mode 100644 tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.overlay delete mode 100644 tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.conf delete mode 100644 tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.overlay delete mode 100644 tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.conf delete mode 100644 tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.overlay rename tests/drivers/dma/loop_transfer/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/drivers/dma/scatter_gather/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/drivers/gpio/gpio_basic_api/boards/{em_starterkit.overlay => em_starterkit_emsk_em9d.overlay} (100%) rename tests/drivers/gpio/gpio_basic_api/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/drivers/gpio/gpio_basic_api/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/drivers/i2s/i2s_api/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/drivers/i2s/i2s_speed/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/drivers/pwm/pwm_api/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/drivers/pwm/pwm_loopback/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) rename tests/drivers/regulator/voltage/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/drivers/spi/spi_loopback/boards/{em_starterkit.overlay => em_starterkit_emsk_em9d.overlay} (100%) rename tests/drivers/spi/spi_loopback/boards/{emsdp.conf => emsdp_emsdp_em11d.conf} (100%) rename tests/drivers/spi/spi_loopback/boards/{emsdp.overlay => emsdp_emsdp_em11d.overlay} (100%) rename tests/drivers/spi/spi_loopback/boards/{esp32_devkitc_wroom.conf => esp32_devkitc_wroom_procpu.conf} (100%) rename tests/drivers/spi/spi_loopback/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/drivers/spi/spi_loopback/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) delete mode 100644 tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm4.overlay delete mode 100644 tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm7.overlay delete mode 100644 tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm4.overlay rename tests/drivers/uart/uart_async_api/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/kernel/mem_protect/userspace/boards/{mimxrt685_evk.overlay => mimxrt685_evk_mimxrt685s_cm33.overlay} (100%) rename tests/subsys/debug/coredump_backends/boards/{esp32_devkitc_wroom.overlay => esp32_devkitc_wroom_procpu.overlay} (100%) rename tests/subsys/debug/coredump_backends/boards/{esp32_devkitc_wrover.overlay => esp32_devkitc_wrover_procpu.overlay} (100%) diff --git a/samples/basic/blinky_pwm/boards/esp32_devkitc_wroom.overlay b/samples/basic/blinky_pwm/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/esp32_devkitc_wroom.overlay rename to samples/basic/blinky_pwm/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/basic/blinky_pwm/boards/mimxrt685_evk.overlay b/samples/basic/blinky_pwm/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/mimxrt685_evk.overlay rename to samples/basic/blinky_pwm/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom.conf b/samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom.conf rename to samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom_procpu.conf diff --git a/samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom.overlay b/samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom.overlay rename to samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/boards/esp32/deep_sleep/boards/esp32_devkitc_wroom.conf b/samples/boards/esp32/deep_sleep/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from samples/boards/esp32/deep_sleep/boards/esp32_devkitc_wroom.conf rename to samples/boards/esp32/deep_sleep/boards/esp32_devkitc_wroom_procpu.conf diff --git a/samples/boards/esp32/flash_encryption/boards/esp32_devkitc_wroom.overlay b/samples/boards/esp32/flash_encryption/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/boards/esp32/flash_encryption/boards/esp32_devkitc_wroom.overlay rename to samples/boards/esp32/flash_encryption/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/drivers/adc/boards/esp32_devkitc_wroom.overlay b/samples/drivers/adc/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/drivers/adc/boards/esp32_devkitc_wroom.overlay rename to samples/drivers/adc/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/drivers/adc/boards/esp32_devkitc_wrover.overlay b/samples/drivers/adc/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from samples/drivers/adc/boards/esp32_devkitc_wrover.overlay rename to samples/drivers/adc/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/samples/drivers/adc/boards/mimxrt1160_evk_cm7.overlay b/samples/drivers/adc/boards/mimxrt1160_evk_cm7.overlay deleted file mode 100644 index a27042020d..0000000000 --- a/samples/drivers/adc/boards/mimxrt1160_evk_cm7.overlay +++ /dev/null @@ -1,34 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright 2021,2023 NXP - */ - -#include - -/ { - zephyr,user { - /* adjust channel number according to pinmux in board.dts */ - io-channels = <&lpadc0 0>; - }; -}; - -&lpadc0 { - #address-cells = <1>; - #size-cells = <0>; - - /* - * To use this sample: - * - Connect LPADC0 CH0 signal to voltage between 0~1.8V (J9 pin 10) - */ - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1"; - zephyr,reference = "ADC_REF_EXTERNAL0"; - zephyr,vref-mv = <1800>; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - zephyr,input-positive = ; - }; -}; diff --git a/samples/drivers/adc/boards/mimxrt685_evk.overlay b/samples/drivers/adc/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from samples/drivers/adc/boards/mimxrt685_evk.overlay rename to samples/drivers/adc/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32_devkitc_wroom.overlay b/samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32_devkitc_wroom.overlay rename to samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/drivers/dac/boards/esp32_devkitc_wroom.overlay b/samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/drivers/dac/boards/esp32_devkitc_wroom.overlay rename to samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/drivers/dac/boards/esp32_devkitc_wrover.overlay b/samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from samples/drivers/dac/boards/esp32_devkitc_wrover.overlay rename to samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/samples/drivers/spi_flash/boards/em_starterkit.conf b/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf similarity index 100% rename from samples/drivers/spi_flash/boards/em_starterkit.conf rename to samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf diff --git a/samples/drivers/spi_flash/boards/em_starterkit.overlay b/samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.overlay similarity index 100% rename from samples/drivers/spi_flash/boards/em_starterkit.overlay rename to samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.overlay diff --git a/samples/drivers/spi_flash/boards/emsdp.conf b/samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf similarity index 100% rename from samples/drivers/spi_flash/boards/emsdp.conf rename to samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf diff --git a/samples/drivers/watchdog/boards/esp32_devkitc_wroom.conf b/samples/drivers/watchdog/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from samples/drivers/watchdog/boards/esp32_devkitc_wroom.conf rename to samples/drivers/watchdog/boards/esp32_devkitc_wroom_procpu.conf diff --git a/samples/modules/lvgl/demos/boards/native_sim_64.overlay b/samples/modules/lvgl/demos/boards/native_sim_64.overlay new file mode 100644 index 0000000000..ab50aa66f8 --- /dev/null +++ b/samples/modules/lvgl/demos/boards/native_sim_64.overlay @@ -0,0 +1,6 @@ +/* + * Copyright (c) 2023, Fabian Blatz + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include "native_posix.overlay" diff --git a/samples/net/wifi/boards/esp32_devkitc_wroom.conf b/samples/net/wifi/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from samples/net/wifi/boards/esp32_devkitc_wroom.conf rename to samples/net/wifi/boards/esp32_devkitc_wroom_procpu.conf diff --git a/samples/net/wifi/boards/esp32_devkitc_wroom.overlay b/samples/net/wifi/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/net/wifi/boards/esp32_devkitc_wroom.overlay rename to samples/net/wifi/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/net/wifi/boards/esp32_devkitc_wrover.conf b/samples/net/wifi/boards/esp32_devkitc_wrover_procpu.conf similarity index 100% rename from samples/net/wifi/boards/esp32_devkitc_wrover.conf rename to samples/net/wifi/boards/esp32_devkitc_wrover_procpu.conf diff --git a/samples/net/wifi/boards/esp32_devkitc_wrover.overlay b/samples/net/wifi/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from samples/net/wifi/boards/esp32_devkitc_wrover.overlay rename to samples/net/wifi/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/samples/sensor/fxos8700/boards/mimxrt1160_evk_cm4.conf b/samples/sensor/fxos8700/boards/mimxrt1160_evk_cm4.conf deleted file mode 100644 index 16c619082c..0000000000 --- a/samples/sensor/fxos8700/boards/mimxrt1160_evk_cm4.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_FXOS8700_TRIGGER_OWN_THREAD=n -CONFIG_FXOS8700_TRIGGER_NONE=y diff --git a/samples/sensor/fxos8700/boards/mimxrt1160_evk_cm7.conf b/samples/sensor/fxos8700/boards/mimxrt1160_evk_cm7.conf deleted file mode 100644 index 16c619082c..0000000000 --- a/samples/sensor/fxos8700/boards/mimxrt1160_evk_cm7.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_FXOS8700_TRIGGER_OWN_THREAD=n -CONFIG_FXOS8700_TRIGGER_NONE=y diff --git a/samples/sensor/grow_r502a/boards/esp32_devkitc_wroom.overlay b/samples/sensor/grow_r502a/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/sensor/grow_r502a/boards/esp32_devkitc_wroom.overlay rename to samples/sensor/grow_r502a/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/sensor/lps22hh_i3c/boards/mimxrt685_evk.overlay b/samples/sensor/lps22hh_i3c/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from samples/sensor/lps22hh_i3c/boards/mimxrt685_evk.overlay rename to samples/sensor/lps22hh_i3c/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk.overlay b/samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk.overlay rename to samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/samples/subsys/input/input_dump/boards/esp32_devkitc_wroom.overlay b/samples/subsys/input/input_dump/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/subsys/input/input_dump/boards/esp32_devkitc_wroom.overlay rename to samples/subsys/input/input_dump/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/subsys/input/input_dump/boards/esp32_devkitc_wrover.overlay b/samples/subsys/input/input_dump/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from samples/subsys/input/input_dump/boards/esp32_devkitc_wrover.overlay rename to samples/subsys/input/input_dump/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.conf b/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.conf deleted file mode 100644 index 630a1933d6..0000000000 --- a/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_INCLUDE_REMOTE_DIR=y -CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.overlay deleted file mode 100644 index 7facea692c..0000000000 --- a/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.overlay +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2022 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -/ { - chosen { - zephyr,ipc_shm = &ocram2_overlay; - }; - - /* OpenAMP fails with full 512K OCRAM2 memory region as shared memory. - * Define a subset of the OCRAM2 region for demo to use - * Note that shared memory must have specific MPU attributes set. - */ - ocram2_overlay: memory@202c0000{ - compatible = "zephyr,memory-region", "mmio-sram"; - reg = <0x202c0000 DT_SIZE_K(16)>; - zephyr,memory-region="OCRAM2_OVERLAY"; - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>; - }; -}; diff --git a/samples/subsys/ipc/openamp/boards/mps2_an521.overlay b/samples/subsys/ipc/openamp/boards/mps2_an521_cpu0.overlay similarity index 100% rename from samples/subsys/ipc/openamp/boards/mps2_an521.overlay rename to samples/subsys/ipc/openamp/boards/mps2_an521_cpu0.overlay diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_cm4.overlay b/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_cm4.overlay deleted file mode 100644 index 87159192cf..0000000000 --- a/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_cm4.overlay +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2022-2023 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -/ { - /* Switch to lpuart2, since primary core uses lpuart1 */ - chosen { - zephyr,flash = &ocram; - zephyr,console = &lpuart2; - zephyr,shell-uart = &lpuart2; - zephyr,ipc_shm = &ocram2_overlay; - }; - - soc { - /delete-node/ gpt@400f0000; - - /* Replace GPT2 with another GPT kernel timer */ - gpt2_hw_timer:gpt@400f0000 { - compatible = "nxp,gpt-hw-timer"; - reg = <0x400f0000 0x4000>; - interrupts = <120 0>; - status = "okay"; - }; - }; - - /* OpenAMP fails with full 512K OCRAM2 memory region as shared memory. - * Define a subset of the OCRAM2 region for demo to use - * Note that shared memory must have specific MPU attributes set - */ - ocram2_overlay: memory@202c0000 { - compatible = "zephyr,memory-region", "mmio-sram"; - reg = <0x202c0000 DT_SIZE_K(16)>; - zephyr,memory-region="OCRAM2_OVERLAY"; - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>; - }; -}; - -/* Enable secondary LPUART */ -&lpuart2 { - status = "okay"; - current-speed = <115200>; -}; - -/* Disable primary GPT timer */ -&gpt_hw_timer { - status = "disabled"; -}; diff --git a/samples/subsys/ipc/rpmsg_service/boards/mps2_an521.overlay b/samples/subsys/ipc/rpmsg_service/boards/mps2_an521_cpu0.overlay similarity index 100% rename from samples/subsys/ipc/rpmsg_service/boards/mps2_an521.overlay rename to samples/subsys/ipc/rpmsg_service/boards/mps2_an521_cpu0.overlay diff --git a/samples/subsys/nvs/boards/esp32_devkitc_wroom.conf b/samples/subsys/nvs/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from samples/subsys/nvs/boards/esp32_devkitc_wroom.conf rename to samples/subsys/nvs/boards/esp32_devkitc_wroom_procpu.conf diff --git a/samples/subsys/settings/boards/esp32_devkitc_wroom.conf b/samples/subsys/settings/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from samples/subsys/settings/boards/esp32_devkitc_wroom.conf rename to samples/subsys/settings/boards/esp32_devkitc_wroom_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom.conf b/tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom.conf rename to tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom.overlay b/tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom.overlay rename to tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover.conf b/tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover_procpu.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover.conf rename to tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover.overlay b/tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover.overlay rename to tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/tests/drivers/adc/adc_api/boards/mimxrt685_evk.overlay b/tests/drivers/adc/adc_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/mimxrt685_evk.overlay rename to tests/drivers/adc/adc_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/adc/adc_api/boards/native_posix_64.overlay b/tests/drivers/adc/adc_api/boards/native_posix_64.overlay new file mode 100644 index 0000000000..6b622000bd --- /dev/null +++ b/tests/drivers/adc/adc_api/boards/native_posix_64.overlay @@ -0,0 +1,7 @@ +/* + * Copyright 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_posix.overlay" diff --git a/tests/drivers/adc/adc_api/boards/native_sim_64.overlay b/tests/drivers/adc/adc_api/boards/native_sim_64.overlay new file mode 100644 index 0000000000..6b622000bd --- /dev/null +++ b/tests/drivers/adc/adc_api/boards/native_sim_64.overlay @@ -0,0 +1,7 @@ +/* + * Copyright 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_posix.overlay" diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wroom.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wroom.overlay rename to tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wrover.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wrover.overlay rename to tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/tests/drivers/dac/dac_api/boards/esp32_devkitc_wroom.overlay b/tests/drivers/dac/dac_api/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/drivers/dac/dac_api/boards/esp32_devkitc_wroom.overlay rename to tests/drivers/dac/dac_api/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/drivers/dac/dac_api/boards/esp32_devkitc_wrover.overlay b/tests/drivers/dac/dac_api/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from tests/drivers/dac/dac_api/boards/esp32_devkitc_wrover.overlay rename to tests/drivers/dac/dac_api/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.conf deleted file mode 100644 index cdc6eb7c7f..0000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_CODE_DATA_RELOCATION=y -CONFIG_MEM_ATTR_HEAP=y -CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.overlay deleted file mode 100644 index 5e8bafa1d9..0000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * Copyright (c) 2024 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -&sram1 { - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; -}; - -tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.conf deleted file mode 100644 index 433a67585b..0000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_CODE_DATA_RELOCATION=y -CONFIG_MEM_ATTR_HEAP=y -CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="DTCM" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.overlay deleted file mode 100644 index 82f0bbe94e..0000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * Copyright (c) 2024 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -&dtcm { - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; -}; - -tst_dma0: &edma0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.conf deleted file mode 100644 index f3ceb4ecbb..0000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_CODE_DATA_RELOCATION=y -CONFIG_NOCACHE_MEMORY=y -CONFIG_MEM_ATTR_HEAP=y -CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.overlay deleted file mode 100644 index 5e8bafa1d9..0000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * Copyright (c) 2024 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -&sram1 { - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; -}; - -tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk.overlay rename to tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_cm7.overlay b/tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_cm7.overlay deleted file mode 100644 index 9d2f44e723..0000000000 --- a/tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_cm7.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * - * SPDX-License-Identifier: Apache-2.0 - */ - -dma0: &edma0 { }; diff --git a/tests/drivers/dma/chan_link_transfer/boards/native_sim_64.overlay b/tests/drivers/dma/chan_link_transfer/boards/native_sim_64.overlay new file mode 100644 index 0000000000..cbe8410767 --- /dev/null +++ b/tests/drivers/dma/chan_link_transfer/boards/native_sim_64.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 Meta + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_sim.overlay" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.conf deleted file mode 100644 index cdc6eb7c7f..0000000000 --- a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_CODE_DATA_RELOCATION=y -CONFIG_MEM_ATTR_HEAP=y -CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.overlay deleted file mode 100644 index 5e8bafa1d9..0000000000 --- a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * Copyright (c) 2024 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -&sram1 { - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; -}; - -tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.conf deleted file mode 100644 index 8aa11602c6..0000000000 --- a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_CODE_DATA_RELOCATION=y -CONFIG_MEM_ATTR_HEAP=y -CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="ITCM" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.overlay deleted file mode 100644 index 43b7fc3782..0000000000 --- a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * Copyright (c) 2024 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -&itcm { - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; -}; - -tst_dma0: &edma0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.conf deleted file mode 100644 index cdc6eb7c7f..0000000000 --- a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_CODE_DATA_RELOCATION=y -CONFIG_MEM_ATTR_HEAP=y -CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.overlay deleted file mode 100644 index 5e8bafa1d9..0000000000 --- a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.overlay +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2022 Kumar Gala - * Copyright (c) 2024 NXP - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -&sram1 { - zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; -}; - -tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt685_evk.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/mimxrt685_evk.overlay rename to tests/drivers/dma/loop_transfer/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/dma/scatter_gather/boards/mimxrt685_evk.overlay b/tests/drivers/dma/scatter_gather/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/dma/scatter_gather/boards/mimxrt685_evk.overlay rename to tests/drivers/dma/scatter_gather/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/em_starterkit.overlay b/tests/drivers/gpio/gpio_basic_api/boards/em_starterkit_emsk_em9d.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/em_starterkit.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/em_starterkit_emsk_em9d.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32_devkitc_wroom.overlay b/tests/drivers/gpio/gpio_basic_api/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/esp32_devkitc_wroom.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk.overlay b/tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/i2s/i2s_api/boards/mimxrt685_evk.overlay b/tests/drivers/i2s/i2s_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/i2s/i2s_api/boards/mimxrt685_evk.overlay rename to tests/drivers/i2s/i2s_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk.overlay b/tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk.overlay rename to tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/pwm/pwm_api/boards/esp32_devkitc_wroom.overlay b/tests/drivers/pwm/pwm_api/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_api/boards/esp32_devkitc_wroom.overlay rename to tests/drivers/pwm/pwm_api/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover.overlay b/tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover.overlay rename to tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/tests/drivers/regulator/voltage/boards/mimxrt685_evk.overlay b/tests/drivers/regulator/voltage/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/regulator/voltage/boards/mimxrt685_evk.overlay rename to tests/drivers/regulator/voltage/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/em_starterkit.overlay b/tests/drivers/spi/spi_loopback/boards/em_starterkit_emsk_em9d.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/em_starterkit.overlay rename to tests/drivers/spi/spi_loopback/boards/em_starterkit_emsk_em9d.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/emsdp.conf b/tests/drivers/spi/spi_loopback/boards/emsdp_emsdp_em11d.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/emsdp.conf rename to tests/drivers/spi/spi_loopback/boards/emsdp_emsdp_em11d.conf diff --git a/tests/drivers/spi/spi_loopback/boards/emsdp.overlay b/tests/drivers/spi/spi_loopback/boards/emsdp_emsdp_em11d.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/emsdp.overlay rename to tests/drivers/spi/spi_loopback/boards/emsdp_emsdp_em11d.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom.conf b/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom.conf rename to tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.conf diff --git a/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom.overlay b/tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom.overlay rename to tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt685_evk.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/mimxrt685_evk.overlay rename to tests/drivers/spi/spi_loopback/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm4.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm4.overlay deleted file mode 100644 index 4f031193d1..0000000000 --- a/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm4.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -dut: &lpuart2 { - status = "okay"; - current-speed = <115200>; - nxp,loopback; -}; diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm7.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm7.overlay deleted file mode 100644 index 37f2577dc2..0000000000 --- a/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm7.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -/ { - chosen { - zephyr,sram = &dtcm; - }; -}; - -dut: &lpuart2 { - status = "okay"; - current-speed = <115200>; - nxp,loopback; -}; diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm4.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm4.overlay deleted file mode 100644 index 4f031193d1..0000000000 --- a/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm4.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -dut: &lpuart2 { - status = "okay"; - current-speed = <115200>; - nxp,loopback; -}; diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt685_evk.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/mimxrt685_evk.overlay rename to tests/drivers/uart/uart_async_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/kernel/mem_protect/userspace/boards/mimxrt685_evk.overlay b/tests/kernel/mem_protect/userspace/boards/mimxrt685_evk_mimxrt685s_cm33.overlay similarity index 100% rename from tests/kernel/mem_protect/userspace/boards/mimxrt685_evk.overlay rename to tests/kernel/mem_protect/userspace/boards/mimxrt685_evk_mimxrt685s_cm33.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom.overlay b/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom.overlay rename to tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover.overlay b/tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover.overlay rename to tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay