From a205fe9155926824062bee2f200b4720dfa43fe5 Mon Sep 17 00:00:00 2001 From: Raffael Rostagno Date: Tue, 30 Jul 2024 13:21:38 -0300 Subject: [PATCH] samples: esp32c3: Move config files from boards to socs Move samples config files from 'boards' to 'socs' in order to remove multiple files with the same configuration and render available samples for new boards. Only changed sample files which are not board or hardware specific. Signed-off-by: Raffael Rostagno --- .../boards/esp32c3_luatos_core.conf | 1 - .../boards/esp32c3_luatos_core.overlay | 21 ----------- .../esp32c3_luatos_core_esp32c3_usb.conf | 1 - .../esp32c3_luatos_core_esp32c3_usb.overlay | 21 ----------- .../esp32c3.conf} | 0 .../esp32c3.overlay} | 0 .../esp32c3_luatos_core_esp32c3_usb.overlay | 3 -- .../esp32c3.overlay} | 0 .../boards/esp32c3_luatos_core.conf | 1 - .../boards/esp32c3_luatos_core.overlay | 11 ------ .../esp32c3_luatos_core_esp32c3_usb.conf | 1 - .../esp32c3_luatos_core_esp32c3_usb.overlay | 11 ------ .../esp32c3.conf} | 0 .../esp32c3.overlay} | 0 .../nvs/boards/esp32c3_luatos_core.conf | 1 - .../esp32c3_luatos_core_esp32c3_usb.conf | 1 - .../esp32c3.conf} | 0 .../settings/boards/esp32c3_luatos_core.conf | 4 --- .../esp32c3_luatos_core_esp32c3_usb.conf | 4 --- .../esp32c3.conf} | 0 .../adc_api/boards/esp32c3_luatos_core.conf | 1 - .../boards/esp32c3_luatos_core.overlay | 35 ------------------- .../esp32c3_luatos_core_esp32c3_usb.conf | 1 - .../esp32c3_luatos_core_esp32c3_usb.overlay | 35 ------------------- .../esp32c3.conf} | 0 .../esp32c3.overlay} | 0 .../boards/esp32c3_devkitm.overlay | 3 -- .../boards/esp32c3_luatos_core.overlay | 3 -- .../esp32c3_luatos_core_esp32c3_usb.overlay | 3 -- .../counter_basic_api/socs/esp32c3.overlay | 0 .../boards/esp32c3_devkitm.overlay | 11 ------ .../boards/esp32c3_luatos_core.conf | 3 -- .../boards/esp32c3_luatos_core.overlay | 11 ------ .../esp32c3_luatos_core_esp32c3_usb.conf | 3 -- .../esp32c3.conf} | 0 .../esp32c3.overlay} | 2 +- .../boards/esp32c3_luatos_core.conf | 2 -- .../boards/esp32c3_luatos_core.overlay | 11 ------ .../esp32c3_luatos_core_esp32c3_usb.conf | 2 -- .../esp32c3_luatos_core_esp32c3_usb.overlay | 11 ------ .../esp32c3.conf} | 0 .../esp32c3.overlay} | 2 +- .../common/boards/esp32c3_luatos_core.conf | 1 - .../esp32c3_luatos_core_esp32c3_usb.conf | 1 - .../esp32c3.conf} | 0 .../boards/esp32c3_luatos_core.overlay | 13 ------- .../esp32c3_luatos_core_esp32c3_usb.overlay | 13 ------- .../esp32c3.overlay} | 2 +- .../pwm_api/boards/esp32c3_devkitm.overlay | 34 ------------------ .../boards/esp32c3_luatos_core.overlay | 34 ------------------ .../esp32c3.overlay} | 2 +- .../esp32c3.conf} | 0 .../esp32c3.overlay} | 0 .../boards/esp32c3_luatos_core.overlay | 25 ------------- .../esp32c3_luatos_core_esp32c3_usb.overlay | 25 ------------- .../esp32c3.overlay} | 0 56 files changed, 4 insertions(+), 366 deletions(-) delete mode 100644 samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.conf delete mode 100644 samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.overlay delete mode 100644 samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.conf delete mode 100644 samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename samples/boards/esp32/deep_sleep/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) rename samples/boards/esp32/deep_sleep/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (100%) delete mode 100644 samples/drivers/counter/alarm/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename samples/drivers/counter/alarm/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (100%) delete mode 100644 samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.conf delete mode 100644 samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.overlay delete mode 100644 samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.conf delete mode 100644 samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename samples/sensor/die_temp_polling/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) rename samples/sensor/die_temp_polling/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (100%) delete mode 100644 samples/subsys/nvs/boards/esp32c3_luatos_core.conf delete mode 100644 samples/subsys/nvs/boards/esp32c3_luatos_core_esp32c3_usb.conf rename samples/subsys/nvs/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) delete mode 100644 samples/subsys/settings/boards/esp32c3_luatos_core.conf delete mode 100644 samples/subsys/settings/boards/esp32c3_luatos_core_esp32c3_usb.conf rename samples/subsys/settings/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) delete mode 100644 tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.conf delete mode 100644 tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.overlay delete mode 100644 tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.conf delete mode 100644 tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename tests/drivers/adc/adc_api/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) rename tests/drivers/adc/adc_api/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (100%) delete mode 100644 tests/drivers/counter/counter_basic_api/boards/esp32c3_devkitm.overlay delete mode 100644 tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core.overlay delete mode 100644 tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename samples/drivers/counter/alarm/boards/esp32c3_luatos_core.overlay => tests/drivers/counter/counter_basic_api/socs/esp32c3.overlay (100%) delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/esp32c3_devkitm.overlay delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.conf delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.overlay delete mode 100644 tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf rename tests/drivers/dma/chan_blen_transfer/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) rename tests/drivers/dma/chan_blen_transfer/{boards/esp32c3_luatos_core_esp32c3_usb.overlay => socs/esp32c3.overlay} (61%) delete mode 100644 tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.conf delete mode 100644 tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.overlay delete mode 100644 tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf delete mode 100644 tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename tests/drivers/dma/loop_transfer/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) rename tests/drivers/dma/loop_transfer/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (61%) delete mode 100644 tests/drivers/flash/common/boards/esp32c3_luatos_core.conf delete mode 100644 tests/drivers/flash/common/boards/esp32c3_luatos_core_esp32c3_usb.conf rename tests/drivers/flash/common/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core.overlay delete mode 100644 tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename tests/drivers/gpio/gpio_basic_api/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (73%) delete mode 100644 tests/drivers/pwm/pwm_api/boards/esp32c3_devkitm.overlay delete mode 100644 tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core.overlay rename tests/drivers/pwm/pwm_api/{boards/esp32c3_luatos_core_esp32c3_usb.overlay => socs/esp32c3.overlay} (87%) rename tests/drivers/uart/uart_async_api/{boards/esp32c3_devkitm.conf => socs/esp32c3.conf} (100%) rename tests/drivers/uart/uart_async_api/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (100%) delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core.overlay delete mode 100644 tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename tests/subsys/debug/coredump_backends/{boards/esp32c3_devkitm.overlay => socs/esp32c3.overlay} (100%) diff --git a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.conf b/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 2ce9f6b8f5c..00000000000 --- a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXAMPLE_GPIO_WAKEUP=y diff --git a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.overlay b/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index 6235a933aec..00000000000 --- a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - aliases { - /* On ESP32-C3, only GPIO0~5 can be used - * as wake-up sources - */ - wakeup-button = &sample_button; - }; - - gpio_keys { - compatible = "gpio-keys"; - sample_button: sample_button { - gpios = <&gpio0 0 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; - }; - }; -}; diff --git a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.conf b/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 2ce9f6b8f5c..00000000000 --- a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXAMPLE_GPIO_WAKEUP=y diff --git a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index 6235a933aec..00000000000 --- a/samples/boards/esp32/deep_sleep/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - aliases { - /* On ESP32-C3, only GPIO0~5 can be used - * as wake-up sources - */ - wakeup-button = &sample_button; - }; - - gpio_keys { - compatible = "gpio-keys"; - sample_button: sample_button { - gpios = <&gpio0 0 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; - }; - }; -}; diff --git a/samples/boards/esp32/deep_sleep/boards/esp32c3_devkitm.conf b/samples/boards/esp32/deep_sleep/socs/esp32c3.conf similarity index 100% rename from samples/boards/esp32/deep_sleep/boards/esp32c3_devkitm.conf rename to samples/boards/esp32/deep_sleep/socs/esp32c3.conf diff --git a/samples/boards/esp32/deep_sleep/boards/esp32c3_devkitm.overlay b/samples/boards/esp32/deep_sleep/socs/esp32c3.overlay similarity index 100% rename from samples/boards/esp32/deep_sleep/boards/esp32c3_devkitm.overlay rename to samples/boards/esp32/deep_sleep/socs/esp32c3.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/drivers/counter/alarm/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/samples/drivers/counter/alarm/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/samples/drivers/counter/alarm/boards/esp32c3_devkitm.overlay b/samples/drivers/counter/alarm/socs/esp32c3.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32c3_devkitm.overlay rename to samples/drivers/counter/alarm/socs/esp32c3.overlay diff --git a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.conf b/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 5ab7306afeb..00000000000 --- a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_REQUIRES_FULL_LIBC=y diff --git a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.overlay b/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index a1229102bf8..00000000000 --- a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023, Hiroki Tada - * - * SPDX-License-Identifier: Apache-2.0 - * - * Application overlay for creating temperature sensor device instance - */ - -&coretemp { - status = "okay"; -}; diff --git a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.conf b/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 5ab7306afeb..00000000000 --- a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_REQUIRES_FULL_LIBC=y diff --git a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index a1229102bf8..00000000000 --- a/samples/sensor/die_temp_polling/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2023, Hiroki Tada - * - * SPDX-License-Identifier: Apache-2.0 - * - * Application overlay for creating temperature sensor device instance - */ - -&coretemp { - status = "okay"; -}; diff --git a/samples/sensor/die_temp_polling/boards/esp32c3_devkitm.conf b/samples/sensor/die_temp_polling/socs/esp32c3.conf similarity index 100% rename from samples/sensor/die_temp_polling/boards/esp32c3_devkitm.conf rename to samples/sensor/die_temp_polling/socs/esp32c3.conf diff --git a/samples/sensor/die_temp_polling/boards/esp32c3_devkitm.overlay b/samples/sensor/die_temp_polling/socs/esp32c3.overlay similarity index 100% rename from samples/sensor/die_temp_polling/boards/esp32c3_devkitm.overlay rename to samples/sensor/die_temp_polling/socs/esp32c3.overlay diff --git a/samples/subsys/nvs/boards/esp32c3_luatos_core.conf b/samples/subsys/nvs/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 26d52701286..00000000000 --- a/samples/subsys/nvs/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 diff --git a/samples/subsys/nvs/boards/esp32c3_luatos_core_esp32c3_usb.conf b/samples/subsys/nvs/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 26d52701286..00000000000 --- a/samples/subsys/nvs/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 diff --git a/samples/subsys/nvs/boards/esp32c3_devkitm.conf b/samples/subsys/nvs/socs/esp32c3.conf similarity index 100% rename from samples/subsys/nvs/boards/esp32c3_devkitm.conf rename to samples/subsys/nvs/socs/esp32c3.conf diff --git a/samples/subsys/settings/boards/esp32c3_luatos_core.conf b/samples/subsys/settings/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 498fb072287..00000000000 --- a/samples/subsys/settings/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/boards/esp32c3_luatos_core_esp32c3_usb.conf b/samples/subsys/settings/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 498fb072287..00000000000 --- a/samples/subsys/settings/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=256 -CONFIG_NVS=y -CONFIG_SETTINGS_NVS=y -CONFIG_MPU_ALLOW_FLASH_WRITE=y diff --git a/samples/subsys/settings/boards/esp32c3_devkitm.conf b/samples/subsys/settings/socs/esp32c3.conf similarity index 100% rename from samples/subsys/settings/boards/esp32c3_devkitm.conf rename to samples/subsys/settings/socs/esp32c3.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.conf b/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.conf deleted file mode 100644 index b6c5c80f924..00000000000 --- a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ADC_ASYNC=n diff --git a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.overlay b/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index c288312aa3a..00000000000 --- a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * Copyright (c) 2023 Benjamin Björnsson - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - /* adjust channel number according to pinmux in board.dts */ - io-channels = <&adc0 0>, <&adc0 1>; - }; -}; - -&adc0 { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; - - channel@1 { - reg = <1>; - zephyr,gain = "ADC_GAIN_1"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.conf b/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index b6c5c80f924..00000000000 --- a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ADC_ASYNC=n diff --git a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index c288312aa3a..00000000000 --- a/tests/drivers/adc/adc_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2022 Wolter HV - * Copyright (c) 2023 Benjamin Björnsson - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - zephyr,user { - /* adjust channel number according to pinmux in board.dts */ - io-channels = <&adc0 0>, <&adc0 1>; - }; -}; - -&adc0 { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - channel@0 { - reg = <0>; - zephyr,gain = "ADC_GAIN_1"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; - - channel@1 { - reg = <1>; - zephyr,gain = "ADC_GAIN_1"; - zephyr,reference = "ADC_REF_INTERNAL"; - zephyr,acquisition-time = ; - zephyr,resolution = <12>; - }; -}; diff --git a/tests/drivers/adc/adc_api/boards/esp32c3_devkitm.conf b/tests/drivers/adc/adc_api/socs/esp32c3.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32c3_devkitm.conf rename to tests/drivers/adc/adc_api/socs/esp32c3.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32c3_devkitm.overlay b/tests/drivers/adc/adc_api/socs/esp32c3.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32c3_devkitm.overlay rename to tests/drivers/adc/adc_api/socs/esp32c3.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32c3_devkitm.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32c3_devkitm.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/tests/drivers/counter/counter_basic_api/boards/esp32c3_devkitm.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index 241947b0643..00000000000 --- a/tests/drivers/counter/counter_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,3 +0,0 @@ -&timer0 { - status = "okay"; -}; diff --git a/samples/drivers/counter/alarm/boards/esp32c3_luatos_core.overlay b/tests/drivers/counter/counter_basic_api/socs/esp32c3.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32c3_luatos_core.overlay rename to tests/drivers/counter/counter_basic_api/socs/esp32c3.overlay diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_devkitm.overlay b/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_devkitm.overlay deleted file mode 100644 index c93ef734fba..00000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_devkitm.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&dma { - status = "okay"; -}; - -tst_dma0: &dma { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.conf b/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 56bf25e718b..00000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_DMA_TRANSFER_CHANNEL_NR_0=5 -CONFIG_DMA_TRANSFER_CHANNEL_NR_1=0 -CONFIG_HEAP_MEM_POOL_SIZE=32768 diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.overlay b/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index c93ef734fba..00000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&dma { - status = "okay"; -}; - -tst_dma0: &dma { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf b/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 56bf25e718b..00000000000 --- a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_DMA_TRANSFER_CHANNEL_NR_0=5 -CONFIG_DMA_TRANSFER_CHANNEL_NR_1=0 -CONFIG_HEAP_MEM_POOL_SIZE=32768 diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_devkitm.conf b/tests/drivers/dma/chan_blen_transfer/socs/esp32c3.conf similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32c3_devkitm.conf rename to tests/drivers/dma/chan_blen_transfer/socs/esp32c3.conf diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/dma/chan_blen_transfer/socs/esp32c3.overlay similarity index 61% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename to tests/drivers/dma/chan_blen_transfer/socs/esp32c3.overlay index c93ef734fba..6ac9ff08336 100644 --- a/tests/drivers/dma/chan_blen_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ b/tests/drivers/dma/chan_blen_transfer/socs/esp32c3.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. + * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.conf b/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 311bfc8f535..00000000000 --- a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_DMA_LOOP_TRANSFER_CHANNEL_NR=0 -CONFIG_DMA_LOOP_TRANSFER_SIZE=4094 diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.overlay b/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index c93ef734fba..00000000000 --- a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&dma { - status = "okay"; -}; - -tst_dma0: &dma { }; diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf b/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 311bfc8f535..00000000000 --- a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_DMA_LOOP_TRANSFER_CHANNEL_NR=0 -CONFIG_DMA_LOOP_TRANSFER_SIZE=4094 diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index c93ef734fba..00000000000 --- a/tests/drivers/dma/loop_transfer/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&dma { - status = "okay"; -}; - -tst_dma0: &dma { }; diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c3_devkitm.conf b/tests/drivers/dma/loop_transfer/socs/esp32c3.conf similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32c3_devkitm.conf rename to tests/drivers/dma/loop_transfer/socs/esp32c3.conf diff --git a/tests/drivers/dma/loop_transfer/boards/esp32c3_devkitm.overlay b/tests/drivers/dma/loop_transfer/socs/esp32c3.overlay similarity index 61% rename from tests/drivers/dma/loop_transfer/boards/esp32c3_devkitm.overlay rename to tests/drivers/dma/loop_transfer/socs/esp32c3.overlay index c93ef734fba..6ac9ff08336 100644 --- a/tests/drivers/dma/loop_transfer/boards/esp32c3_devkitm.overlay +++ b/tests/drivers/dma/loop_transfer/socs/esp32c3.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd. + * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tests/drivers/flash/common/boards/esp32c3_luatos_core.conf b/tests/drivers/flash/common/boards/esp32c3_luatos_core.conf deleted file mode 100644 index 2bcf636958b..00000000000 --- a/tests/drivers/flash/common/boards/esp32c3_luatos_core.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=16384 diff --git a/tests/drivers/flash/common/boards/esp32c3_luatos_core_esp32c3_usb.conf b/tests/drivers/flash/common/boards/esp32c3_luatos_core_esp32c3_usb.conf deleted file mode 100644 index 2bcf636958b..00000000000 --- a/tests/drivers/flash/common/boards/esp32c3_luatos_core_esp32c3_usb.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HEAP_MEM_POOL_SIZE=16384 diff --git a/tests/drivers/flash/common/boards/esp32c3_devkitm.conf b/tests/drivers/flash/common/socs/esp32c3.conf similarity index 100% rename from tests/drivers/flash/common/boards/esp32c3_devkitm.conf rename to tests/drivers/flash/common/socs/esp32c3.conf diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core.overlay b/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index 6c4f3e2e226..00000000000 --- a/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - resources { - compatible = "test-gpio-basic-api"; - out-gpios = <&gpio0 4 0>; - in-gpios = <&gpio0 5 0>; - }; -}; diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index 6c4f3e2e226..00000000000 --- a/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/ { - resources { - compatible = "test-gpio-basic-api"; - out-gpios = <&gpio0 4 0>; - in-gpios = <&gpio0 5 0>; - }; -}; diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_devkitm.overlay b/tests/drivers/gpio/gpio_basic_api/socs/esp32c3.overlay similarity index 73% rename from tests/drivers/gpio/gpio_basic_api/boards/esp32c3_devkitm.overlay rename to tests/drivers/gpio/gpio_basic_api/socs/esp32c3.overlay index 6c4f3e2e226..313d947d0c8 100644 --- a/tests/drivers/gpio/gpio_basic_api/boards/esp32c3_devkitm.overlay +++ b/tests/drivers/gpio/gpio_basic_api/socs/esp32c3.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. + * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tests/drivers/pwm/pwm_api/boards/esp32c3_devkitm.overlay b/tests/drivers/pwm/pwm_api/boards/esp32c3_devkitm.overlay deleted file mode 100644 index 409f7dc30a7..00000000000 --- a/tests/drivers/pwm/pwm_api/boards/esp32c3_devkitm.overlay +++ /dev/null @@ -1,34 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - */ - -#include - -/ { - aliases { - pwm-0 = &ledc0; - }; -}; - -&pinctrl { - ledc0_default: ledc0_default { - group1 { - pinmux = ; - output-enable; - }; - }; -}; - -&ledc0 { - pinctrl-0 = <&ledc0_default>; - pinctrl-names = "default"; - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - channel0@0 { - reg = <0x0>; - timer = <0>; - }; -}; diff --git a/tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core.overlay b/tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index 409f7dc30a7..00000000000 --- a/tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,34 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - */ - -#include - -/ { - aliases { - pwm-0 = &ledc0; - }; -}; - -&pinctrl { - ledc0_default: ledc0_default { - group1 { - pinmux = ; - output-enable; - }; - }; -}; - -&ledc0 { - pinctrl-0 = <&ledc0_default>; - pinctrl-names = "default"; - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; - channel0@0 { - reg = <0x0>; - timer = <0>; - }; -}; diff --git a/tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/drivers/pwm/pwm_api/socs/esp32c3.overlay similarity index 87% rename from tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay rename to tests/drivers/pwm/pwm_api/socs/esp32c3.overlay index 409f7dc30a7..173073cecd1 100644 --- a/tests/drivers/pwm/pwm_api/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ b/tests/drivers/pwm/pwm_api/socs/esp32c3.overlay @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. + * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. */ #include diff --git a/tests/drivers/uart/uart_async_api/boards/esp32c3_devkitm.conf b/tests/drivers/uart/uart_async_api/socs/esp32c3.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32c3_devkitm.conf rename to tests/drivers/uart/uart_async_api/socs/esp32c3.conf diff --git a/tests/drivers/uart/uart_async_api/boards/esp32c3_devkitm.overlay b/tests/drivers/uart/uart_async_api/socs/esp32c3.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32c3_devkitm.overlay rename to tests/drivers/uart/uart_async_api/socs/esp32c3.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core.overlay b/tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core_esp32c3_usb.overlay b/tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core_esp32c3_usb.overlay deleted file mode 100644 index eb707ee7221..00000000000 --- a/tests/subsys/debug/coredump_backends/boards/esp32c3_luatos_core_esp32c3_usb.overlay +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&flash0 { - partitions { - /* - * Reduce storage_partition to make space for - * coredump_partition - */ - - storage_partition: partition@250000 { - label = "storage"; - reg = <0x00250000 0x00005000>; - }; - - coredump_partition: partition@255000 { - label = "coredump-partition"; - reg = <0x255000 DT_SIZE_K(4)>; - }; - - }; -}; diff --git a/tests/subsys/debug/coredump_backends/boards/esp32c3_devkitm.overlay b/tests/subsys/debug/coredump_backends/socs/esp32c3.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/esp32c3_devkitm.overlay rename to tests/subsys/debug/coredump_backends/socs/esp32c3.overlay