Skip to content

Commit b9f3d68

Browse files
tejlmandcarlescufi
tejlmand
authored and
carlescufi
committed
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 <Torsten.Rasmussen@nordicsemi.no>
1 parent abca917 commit b9f3d68

File tree

85 files changed

+27
-252
lines changed

Some content is hidden

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

85 files changed

+27
-252
lines changed

‎samples/basic/blinky_pwm/boards/esp32_devkitc_wroom.overlay ‎samples/basic/blinky_pwm/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/basic/blinky_pwm/boards/mimxrt685_evk.overlay ‎samples/basic/blinky_pwm/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom.conf ‎samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom.overlay ‎samples/bluetooth/hci_uart/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/boards/esp32/deep_sleep/boards/esp32_devkitc_wroom.conf ‎samples/boards/esp32/deep_sleep/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎samples/boards/esp32/flash_encryption/boards/esp32_devkitc_wroom.overlay ‎samples/boards/esp32/flash_encryption/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/drivers/adc/boards/esp32_devkitc_wroom.overlay ‎samples/drivers/adc/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/drivers/adc/boards/esp32_devkitc_wrover.overlay ‎samples/drivers/adc/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎samples/drivers/adc/boards/mimxrt1160_evk_cm7.overlay

-34
This file was deleted.

‎samples/drivers/adc/boards/mimxrt685_evk.overlay ‎samples/drivers/adc/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎samples/drivers/counter/alarm/boards/esp32_devkitc_wroom.overlay ‎samples/drivers/counter/alarm/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/drivers/dac/boards/esp32_devkitc_wroom.overlay ‎samples/drivers/dac/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/drivers/dac/boards/esp32_devkitc_wrover.overlay ‎samples/drivers/dac/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎samples/drivers/spi_flash/boards/em_starterkit.conf ‎samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.conf

File renamed without changes.

‎samples/drivers/spi_flash/boards/em_starterkit.overlay ‎samples/drivers/spi_flash/boards/em_starterkit_emsk_em9d.overlay

File renamed without changes.

‎samples/drivers/spi_flash/boards/emsdp.conf ‎samples/drivers/spi_flash/boards/emsdp_emsdp_em11d.conf

File renamed without changes.

‎samples/drivers/watchdog/boards/esp32_devkitc_wroom.conf ‎samples/drivers/watchdog/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎samples/modules/lvgl/demos/boards/native_sim_64.overlay

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*
2+
* Copyright (c) 2023, Fabian Blatz <fabianblatz@gmail.com>
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
#include "native_posix.overlay"

‎samples/net/wifi/boards/esp32_devkitc_wroom.conf ‎samples/net/wifi/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎samples/net/wifi/boards/esp32_devkitc_wroom.overlay ‎samples/net/wifi/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/net/wifi/boards/esp32_devkitc_wrover.conf ‎samples/net/wifi/boards/esp32_devkitc_wrover_procpu.conf

File renamed without changes.

‎samples/net/wifi/boards/esp32_devkitc_wrover.overlay ‎samples/net/wifi/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎samples/sensor/fxos8700/boards/mimxrt1160_evk_cm4.conf

-2
This file was deleted.

‎samples/sensor/fxos8700/boards/mimxrt1160_evk_cm7.conf

-2
This file was deleted.

‎samples/sensor/grow_r502a/boards/esp32_devkitc_wroom.overlay ‎samples/sensor/grow_r502a/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/sensor/lps22hh_i3c/boards/mimxrt685_evk.overlay ‎samples/sensor/lps22hh_i3c/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk.overlay ‎samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎samples/subsys/input/input_dump/boards/esp32_devkitc_wroom.overlay ‎samples/subsys/input/input_dump/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎samples/subsys/input/input_dump/boards/esp32_devkitc_wrover.overlay ‎samples/subsys/input/input_dump/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.conf

-2
This file was deleted.

‎samples/subsys/ipc/openamp/boards/mimxrt1160_evk_cm7.overlay

-24
This file was deleted.

‎samples/subsys/ipc/openamp/boards/mps2_an521.overlay ‎samples/subsys/ipc/openamp/boards/mps2_an521_cpu0.overlay

File renamed without changes.

‎samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_cm4.overlay

-51
This file was deleted.

‎samples/subsys/ipc/rpmsg_service/boards/mps2_an521.overlay ‎samples/subsys/ipc/rpmsg_service/boards/mps2_an521_cpu0.overlay

File renamed without changes.

‎samples/subsys/nvs/boards/esp32_devkitc_wroom.conf ‎samples/subsys/nvs/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎samples/subsys/settings/boards/esp32_devkitc_wroom.conf ‎samples/subsys/settings/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom.conf ‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom.overlay ‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover.conf ‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover_procpu.conf

File renamed without changes.

‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover.overlay ‎tests/drivers/adc/adc_api/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎tests/drivers/adc/adc_api/boards/mimxrt685_evk.overlay ‎tests/drivers/adc/adc_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/adc/adc_api/boards/native_posix_64.overlay

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright 2023 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "native_posix.overlay"

‎tests/drivers/adc/adc_api/boards/native_sim_64.overlay

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright 2023 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "native_posix.overlay"

‎tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wroom.overlay ‎tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wrover.overlay ‎tests/drivers/counter/counter_basic_api/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎tests/drivers/dac/dac_api/boards/esp32_devkitc_wroom.overlay ‎tests/drivers/dac/dac_api/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/drivers/dac/dac_api/boards/esp32_devkitc_wrover.overlay ‎tests/drivers/dac/dac_api/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.conf

-3
This file was deleted.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm4.overlay

-14
This file was deleted.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.conf

-3
This file was deleted.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_cm7.overlay

-14
This file was deleted.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.conf

-4
This file was deleted.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm4.overlay

-14
This file was deleted.

‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk.overlay ‎tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_cm7.overlay

-7
This file was deleted.

‎tests/drivers/dma/chan_link_transfer/boards/native_sim_64.overlay

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/*
2+
* Copyright (c) 2023 Meta
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "native_sim.overlay"

‎tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.conf

-3
This file was deleted.

‎tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm4.overlay

-14
This file was deleted.

‎tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.conf

-3
This file was deleted.

‎tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_cm7.overlay

-14
This file was deleted.

‎tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.conf

-3
This file was deleted.

‎tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm4.overlay

-14
This file was deleted.

‎tests/drivers/dma/loop_transfer/boards/mimxrt685_evk.overlay ‎tests/drivers/dma/loop_transfer/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/dma/scatter_gather/boards/mimxrt685_evk.overlay ‎tests/drivers/dma/scatter_gather/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/gpio/gpio_basic_api/boards/em_starterkit.overlay ‎tests/drivers/gpio/gpio_basic_api/boards/em_starterkit_emsk_em9d.overlay

File renamed without changes.

‎tests/drivers/gpio/gpio_basic_api/boards/esp32_devkitc_wroom.overlay ‎tests/drivers/gpio/gpio_basic_api/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk.overlay ‎tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/i2s/i2s_api/boards/mimxrt685_evk.overlay ‎tests/drivers/i2s/i2s_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk.overlay ‎tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/pwm/pwm_api/boards/esp32_devkitc_wroom.overlay ‎tests/drivers/pwm/pwm_api/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover.overlay ‎tests/drivers/pwm/pwm_loopback/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

‎tests/drivers/regulator/voltage/boards/mimxrt685_evk.overlay ‎tests/drivers/regulator/voltage/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/spi/spi_loopback/boards/em_starterkit.overlay ‎tests/drivers/spi/spi_loopback/boards/em_starterkit_emsk_em9d.overlay

File renamed without changes.

‎tests/drivers/spi/spi_loopback/boards/emsdp.conf ‎tests/drivers/spi/spi_loopback/boards/emsdp_emsdp_em11d.conf

File renamed without changes.

‎tests/drivers/spi/spi_loopback/boards/emsdp.overlay ‎tests/drivers/spi/spi_loopback/boards/emsdp_emsdp_em11d.overlay

File renamed without changes.

‎tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom.conf ‎tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.conf

File renamed without changes.

‎tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom.overlay ‎tests/drivers/spi/spi_loopback/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/drivers/spi/spi_loopback/boards/mimxrt685_evk.overlay ‎tests/drivers/spi/spi_loopback/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm4.overlay

-7
This file was deleted.

‎tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_cm7.overlay

-13
This file was deleted.

‎tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm4.overlay

-7
This file was deleted.

‎tests/drivers/uart/uart_async_api/boards/mimxrt685_evk.overlay ‎tests/drivers/uart/uart_async_api/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/kernel/mem_protect/userspace/boards/mimxrt685_evk.overlay ‎tests/kernel/mem_protect/userspace/boards/mimxrt685_evk_mimxrt685s_cm33.overlay

File renamed without changes.

‎tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom.overlay ‎tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wroom_procpu.overlay

File renamed without changes.

‎tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover.overlay ‎tests/subsys/debug/coredump_backends/boards/esp32_devkitc_wrover_procpu.overlay

File renamed without changes.

0 commit comments

Comments
 (0)