diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu.dts b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts similarity index 100% rename from boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu.dts rename to boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu.yaml b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.yaml similarity index 100% rename from boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu.yaml rename to boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.yaml diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu_defconfig b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu_defconfig similarity index 100% rename from boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu_defconfig rename to boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu_defconfig diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu.dts b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts similarity index 100% rename from boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu.dts rename to boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu.yaml b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml similarity index 100% rename from boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu.yaml rename to boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.yaml diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu_defconfig b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu_defconfig similarity index 100% rename from boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu_defconfig rename to boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu_defconfig diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_appcpu.dts b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts similarity index 100% rename from boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_appcpu.dts rename to boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.dts diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_appcpu.yaml b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.yaml similarity index 100% rename from boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_appcpu.yaml rename to boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu.yaml diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_appcpu_defconfig b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu_defconfig similarity index 100% rename from boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_appcpu_defconfig rename to boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_appcpu_defconfig diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_procpu.dts b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts similarity index 100% rename from boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_procpu.dts rename to boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_procpu.yaml b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml similarity index 100% rename from boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_procpu.yaml rename to boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.yaml diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_procpu_defconfig b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu_defconfig similarity index 100% rename from boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_esp32_procpu_defconfig rename to boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu_defconfig diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts similarity index 100% rename from boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.dts rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.dts diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.yaml b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.yaml similarity index 100% rename from boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.yaml rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu.yaml diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu_defconfig b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu_defconfig similarity index 100% rename from boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu_defconfig rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_appcpu_defconfig diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts similarity index 100% rename from boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.dts rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.yaml b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml similarity index 100% rename from boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.yaml rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.yaml diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu_defconfig b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu_defconfig similarity index 100% rename from boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu_defconfig rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu_defconfig diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_appcpu.dts b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts similarity index 100% rename from boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_appcpu.dts rename to boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.dts diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_appcpu.yaml b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.yaml similarity index 100% rename from boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_appcpu.yaml rename to boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu.yaml diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_appcpu_defconfig b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu_defconfig similarity index 100% rename from boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_appcpu_defconfig rename to boards/espressif/esp32s3_devkitc/esp32s3_devkitc_appcpu_defconfig diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_procpu.dts b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts similarity index 100% rename from boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_procpu.dts rename to boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_procpu.yaml b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.yaml similarity index 100% rename from boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_procpu.yaml rename to boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.yaml diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_procpu_defconfig b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu_defconfig similarity index 100% rename from boards/espressif/esp32s3_devkitc/esp32s3_devkitc_esp32s3_procpu_defconfig rename to boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu_defconfig diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_appcpu.dts b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts similarity index 100% rename from boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_appcpu.dts rename to boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.dts diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_appcpu.yaml b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.yaml similarity index 100% rename from boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_appcpu.yaml rename to boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu.yaml diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_appcpu_defconfig b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu_defconfig similarity index 100% rename from boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_appcpu_defconfig rename to boards/espressif/esp32s3_devkitm/esp32s3_devkitm_appcpu_defconfig diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_procpu.dts b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts similarity index 100% rename from boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_procpu.dts rename to boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_procpu.yaml b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.yaml similarity index 100% rename from boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_procpu.yaml rename to boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.yaml diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_procpu_defconfig b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu_defconfig similarity index 100% rename from boards/espressif/esp32s3_devkitm/esp32s3_devkitm_esp32s3_procpu_defconfig rename to boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu_defconfig diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu.dts b/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.dts similarity index 100% rename from boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu.dts rename to boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.dts diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu.yaml b/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.yaml similarity index 100% rename from boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu.yaml rename to boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu.yaml diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu_defconfig b/boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu_defconfig similarity index 100% rename from boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu_defconfig rename to boards/espressif/esp_wrover_kit/esp_wrover_kit_appcpu_defconfig diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu.dts b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts similarity index 100% rename from boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu.dts rename to boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu.yaml b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.yaml similarity index 100% rename from boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu.yaml rename to boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.yaml diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu_defconfig b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu_defconfig similarity index 100% rename from boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu_defconfig rename to boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu_defconfig diff --git a/boards/hardkernel/odroid_go/odroid_go_esp32_appcpu.dts b/boards/hardkernel/odroid_go/odroid_go_appcpu.dts similarity index 100% rename from boards/hardkernel/odroid_go/odroid_go_esp32_appcpu.dts rename to boards/hardkernel/odroid_go/odroid_go_appcpu.dts diff --git a/boards/hardkernel/odroid_go/odroid_go_esp32_appcpu.yaml b/boards/hardkernel/odroid_go/odroid_go_appcpu.yaml similarity index 100% rename from boards/hardkernel/odroid_go/odroid_go_esp32_appcpu.yaml rename to boards/hardkernel/odroid_go/odroid_go_appcpu.yaml diff --git a/boards/hardkernel/odroid_go/odroid_go_esp32_appcpu_defconfig b/boards/hardkernel/odroid_go/odroid_go_appcpu_defconfig similarity index 100% rename from boards/hardkernel/odroid_go/odroid_go_esp32_appcpu_defconfig rename to boards/hardkernel/odroid_go/odroid_go_appcpu_defconfig diff --git a/boards/hardkernel/odroid_go/odroid_go_esp32_procpu.dts b/boards/hardkernel/odroid_go/odroid_go_procpu.dts similarity index 100% rename from boards/hardkernel/odroid_go/odroid_go_esp32_procpu.dts rename to boards/hardkernel/odroid_go/odroid_go_procpu.dts diff --git a/boards/hardkernel/odroid_go/odroid_go_esp32_procpu.yaml b/boards/hardkernel/odroid_go/odroid_go_procpu.yaml similarity index 100% rename from boards/hardkernel/odroid_go/odroid_go_esp32_procpu.yaml rename to boards/hardkernel/odroid_go/odroid_go_procpu.yaml diff --git a/boards/hardkernel/odroid_go/odroid_go_esp32_procpu_defconfig b/boards/hardkernel/odroid_go/odroid_go_procpu_defconfig similarity index 100% rename from boards/hardkernel/odroid_go/odroid_go_esp32_procpu_defconfig rename to boards/hardkernel/odroid_go/odroid_go_procpu_defconfig diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_appcpu.dts b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_appcpu.dts similarity index 100% rename from boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_appcpu.dts rename to boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_appcpu.dts diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_appcpu.yaml b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_appcpu.yaml similarity index 100% rename from boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_appcpu.yaml rename to boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_appcpu.yaml diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_appcpu_defconfig b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_appcpu_defconfig similarity index 100% rename from boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_appcpu_defconfig rename to boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_appcpu_defconfig diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_procpu.dts b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts similarity index 100% rename from boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_procpu.dts rename to boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_procpu.yaml b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.yaml similarity index 100% rename from boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_procpu.yaml rename to boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.yaml diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_procpu_defconfig b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu_defconfig similarity index 100% rename from boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_esp32_procpu_defconfig rename to boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu_defconfig diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.dts b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_appcpu.dts similarity index 100% rename from boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.dts rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_appcpu.dts diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.yaml b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_appcpu.yaml similarity index 100% rename from boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.yaml rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_appcpu.yaml diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu_defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_appcpu_defconfig similarity index 100% rename from boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu_defconfig rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_appcpu_defconfig diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.dts b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts similarity index 100% rename from boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.dts rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.yaml b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.yaml similarity index 100% rename from boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.yaml rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.yaml diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu_defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu_defconfig similarity index 100% rename from boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu_defconfig rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu_defconfig diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.dts b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_appcpu.dts similarity index 100% rename from boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.dts rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_appcpu.dts diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.yaml b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_appcpu.yaml similarity index 100% rename from boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.yaml rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_appcpu.yaml diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu_defconfig b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_appcpu_defconfig similarity index 100% rename from boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu_defconfig rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_appcpu_defconfig diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.dts b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu.dts similarity index 100% rename from boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.dts rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu.dts diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.yaml b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu.yaml similarity index 100% rename from boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.yaml rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu.yaml diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu_defconfig b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu_defconfig similarity index 100% rename from boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu_defconfig rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_procpu_defconfig diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu.dts b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu.dts similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu.dts rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu.dts diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu.yaml b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu.yaml similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu.yaml rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu.yaml diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_defconfig b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_defconfig similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_defconfig rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_defconfig diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_usb.dts b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_usb.dts similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_usb.dts rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_usb.dts diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_usb.yaml b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_usb.yaml similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_usb.yaml rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_usb.yaml diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_usb_defconfig b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_usb_defconfig similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_appcpu_usb_defconfig rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_appcpu_usb_defconfig diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu.dts b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu.dts similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu.dts rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu.dts diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu.yaml b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu.yaml similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu.yaml rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu.yaml diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_defconfig b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_defconfig similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_defconfig rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_defconfig diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_usb.dts b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb.dts similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_usb.dts rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb.dts diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_usb.yaml b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb.yaml similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_usb.yaml rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb.yaml diff --git a/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_usb_defconfig b/boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb_defconfig similarity index 100% rename from boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_esp32s3_procpu_usb_defconfig rename to boards/luatos/esp32s3_luatos_core/esp32s3_luatos_core_procpu_usb_defconfig diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_appcpu.dts b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_appcpu.dts similarity index 100% rename from boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_appcpu.dts rename to boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_appcpu.dts diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_appcpu.yaml b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_appcpu.yaml similarity index 100% rename from boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_appcpu.yaml rename to boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_appcpu.yaml diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_appcpu_defconfig b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_appcpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_appcpu_defconfig rename to boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_appcpu_defconfig diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_procpu.dts b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.dts similarity index 100% rename from boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_procpu.dts rename to boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.dts diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_procpu.yaml b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.yaml similarity index 100% rename from boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_procpu.yaml rename to boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu.yaml diff --git a/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_procpu_defconfig b/boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_esp32_procpu_defconfig rename to boards/m5stack/m5stack_atom_lite/m5stack_atom_lite_procpu_defconfig diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_appcpu.dts b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_appcpu.dts similarity index 100% rename from boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_appcpu.dts rename to boards/m5stack/m5stack_atoms3/m5stack_atoms3_appcpu.dts diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_appcpu.yaml b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_appcpu.yaml similarity index 100% rename from boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_appcpu.yaml rename to boards/m5stack/m5stack_atoms3/m5stack_atoms3_appcpu.yaml diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_appcpu_defconfig b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_appcpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_appcpu_defconfig rename to boards/m5stack/m5stack_atoms3/m5stack_atoms3_appcpu_defconfig diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_procpu.dts b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.dts similarity index 100% rename from boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_procpu.dts rename to boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.dts diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_procpu.yaml b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.yaml similarity index 100% rename from boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_procpu.yaml rename to boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu.yaml diff --git a/boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_procpu_defconfig b/boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_atoms3/m5stack_atoms3_esp32s3_procpu_defconfig rename to boards/m5stack/m5stack_atoms3/m5stack_atoms3_procpu_defconfig diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_appcpu.dts b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_appcpu.dts similarity index 100% rename from boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_appcpu.dts rename to boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_appcpu.dts diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_appcpu.yaml b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_appcpu.yaml similarity index 100% rename from boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_appcpu.yaml rename to boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_appcpu.yaml diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_appcpu_defconfig b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_appcpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_appcpu_defconfig rename to boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_appcpu_defconfig diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_procpu.dts b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.dts similarity index 100% rename from boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_procpu.dts rename to boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.dts diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_procpu.yaml b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.yaml similarity index 100% rename from boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_procpu.yaml rename to boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu.yaml diff --git a/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_procpu_defconfig b/boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_esp32s3_procpu_defconfig rename to boards/m5stack/m5stack_atoms3_lite/m5stack_atoms3_lite_procpu_defconfig diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_esp32_appcpu.dts b/boards/m5stack/m5stack_core2/m5stack_core2_appcpu.dts similarity index 100% rename from boards/m5stack/m5stack_core2/m5stack_core2_esp32_appcpu.dts rename to boards/m5stack/m5stack_core2/m5stack_core2_appcpu.dts diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_esp32_appcpu.yaml b/boards/m5stack/m5stack_core2/m5stack_core2_appcpu.yaml similarity index 100% rename from boards/m5stack/m5stack_core2/m5stack_core2_esp32_appcpu.yaml rename to boards/m5stack/m5stack_core2/m5stack_core2_appcpu.yaml diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_esp32_appcpu_defconfig b/boards/m5stack/m5stack_core2/m5stack_core2_appcpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_core2/m5stack_core2_esp32_appcpu_defconfig rename to boards/m5stack/m5stack_core2/m5stack_core2_appcpu_defconfig diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_esp32_procpu.dts b/boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts similarity index 100% rename from boards/m5stack/m5stack_core2/m5stack_core2_esp32_procpu.dts rename to boards/m5stack/m5stack_core2/m5stack_core2_procpu.dts diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_esp32_procpu.yaml b/boards/m5stack/m5stack_core2/m5stack_core2_procpu.yaml similarity index 100% rename from boards/m5stack/m5stack_core2/m5stack_core2_esp32_procpu.yaml rename to boards/m5stack/m5stack_core2/m5stack_core2_procpu.yaml diff --git a/boards/m5stack/m5stack_core2/m5stack_core2_esp32_procpu_defconfig b/boards/m5stack/m5stack_core2/m5stack_core2_procpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_core2/m5stack_core2_esp32_procpu_defconfig rename to boards/m5stack/m5stack_core2/m5stack_core2_procpu_defconfig diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.dts b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_appcpu.dts similarity index 100% rename from boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.dts rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_appcpu.dts diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.yaml b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_appcpu.yaml similarity index 100% rename from boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.yaml rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_appcpu.yaml diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu_defconfig b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_appcpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu_defconfig rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_appcpu_defconfig diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.dts b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.dts similarity index 100% rename from boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.dts rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.dts diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.yaml b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.yaml similarity index 100% rename from boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.yaml rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu.yaml diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu_defconfig b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu_defconfig similarity index 100% rename from boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu_defconfig rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_procpu_defconfig diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_appcpu.dts b/boards/m5stack/m5stickc_plus/m5stickc_plus_appcpu.dts similarity index 100% rename from boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_appcpu.dts rename to boards/m5stack/m5stickc_plus/m5stickc_plus_appcpu.dts diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_appcpu.yaml b/boards/m5stack/m5stickc_plus/m5stickc_plus_appcpu.yaml similarity index 100% rename from boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_appcpu.yaml rename to boards/m5stack/m5stickc_plus/m5stickc_plus_appcpu.yaml diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_appcpu_defconfig b/boards/m5stack/m5stickc_plus/m5stickc_plus_appcpu_defconfig similarity index 100% rename from boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_appcpu_defconfig rename to boards/m5stack/m5stickc_plus/m5stickc_plus_appcpu_defconfig diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_procpu.dts b/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts similarity index 100% rename from boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_procpu.dts rename to boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_procpu.yaml b/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.yaml similarity index 100% rename from boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_procpu.yaml rename to boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.yaml diff --git a/boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_procpu_defconfig b/boards/m5stack/m5stickc_plus/m5stickc_plus_procpu_defconfig similarity index 100% rename from boards/m5stack/m5stickc_plus/m5stickc_plus_esp32_procpu_defconfig rename to boards/m5stack/m5stickc_plus/m5stickc_plus_procpu_defconfig diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_appcpu.dts b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu.dts similarity index 100% rename from boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_appcpu.dts rename to boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu.dts diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_appcpu.yaml b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu.yaml similarity index 100% rename from boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_appcpu.yaml rename to boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu.yaml diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_appcpu_defconfig b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu_defconfig similarity index 100% rename from boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_appcpu_defconfig rename to boards/olimex/olimex_esp32_evb/olimex_esp32_evb_appcpu_defconfig diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_procpu.dts b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.dts similarity index 100% rename from boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_procpu.dts rename to boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.dts diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_procpu.yaml b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.yaml similarity index 100% rename from boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_procpu.yaml rename to boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu.yaml diff --git a/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_procpu_defconfig b/boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu_defconfig similarity index 100% rename from boards/olimex/olimex_esp32_evb/olimex_esp32_evb_esp32_procpu_defconfig rename to boards/olimex/olimex_esp32_evb/olimex_esp32_evb_procpu_defconfig diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_appcpu.dts b/boards/seeed/xiao_esp32s3/xiao_esp32s3_appcpu.dts similarity index 100% rename from boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_appcpu.dts rename to boards/seeed/xiao_esp32s3/xiao_esp32s3_appcpu.dts diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_appcpu.yaml b/boards/seeed/xiao_esp32s3/xiao_esp32s3_appcpu.yaml similarity index 100% rename from boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_appcpu.yaml rename to boards/seeed/xiao_esp32s3/xiao_esp32s3_appcpu.yaml diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_appcpu_defconfig b/boards/seeed/xiao_esp32s3/xiao_esp32s3_appcpu_defconfig similarity index 100% rename from boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_appcpu_defconfig rename to boards/seeed/xiao_esp32s3/xiao_esp32s3_appcpu_defconfig diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_procpu.dts b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.dts similarity index 100% rename from boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_procpu.dts rename to boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.dts diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_procpu.yaml b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.yaml similarity index 100% rename from boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_procpu.yaml rename to boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu.yaml diff --git a/boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_procpu_defconfig b/boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_defconfig similarity index 100% rename from boards/seeed/xiao_esp32s3/xiao_esp32s3_esp32s3_procpu_defconfig rename to boards/seeed/xiao_esp32s3/xiao_esp32s3_procpu_defconfig diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.dts b/boards/vcc-gnd/yd_esp32/yd_esp32_appcpu.dts similarity index 100% rename from boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.dts rename to boards/vcc-gnd/yd_esp32/yd_esp32_appcpu.dts diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.yaml b/boards/vcc-gnd/yd_esp32/yd_esp32_appcpu.yaml similarity index 100% rename from boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.yaml rename to boards/vcc-gnd/yd_esp32/yd_esp32_appcpu.yaml diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu_defconfig b/boards/vcc-gnd/yd_esp32/yd_esp32_appcpu_defconfig similarity index 100% rename from boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu_defconfig rename to boards/vcc-gnd/yd_esp32/yd_esp32_appcpu_defconfig diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.dts b/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.dts similarity index 100% rename from boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.dts rename to boards/vcc-gnd/yd_esp32/yd_esp32_procpu.dts diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.yaml b/boards/vcc-gnd/yd_esp32/yd_esp32_procpu.yaml similarity index 100% rename from boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.yaml rename to boards/vcc-gnd/yd_esp32/yd_esp32_procpu.yaml diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu_defconfig b/boards/vcc-gnd/yd_esp32/yd_esp32_procpu_defconfig similarity index 100% rename from boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu_defconfig rename to boards/vcc-gnd/yd_esp32/yd_esp32_procpu_defconfig diff --git a/samples/basic/blinky_pwm/boards/esp32s3_devkitm.overlay b/samples/basic/blinky_pwm/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/esp32s3_devkitm.overlay rename to samples/basic/blinky_pwm/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/basic/blinky_pwm/boards/esp32s3_luatos_core.overlay b/samples/basic/blinky_pwm/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/esp32s3_luatos_core.overlay rename to samples/basic/blinky_pwm/boards/esp32s3_luatos_core_procpu.overlay diff --git a/samples/basic/blinky_pwm/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/samples/basic/blinky_pwm/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to samples/basic/blinky_pwm/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/samples/basic/blinky_pwm/boards/xiao_esp32s3.overlay b/samples/basic/blinky_pwm/boards/xiao_esp32s3_procpu.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/xiao_esp32s3.overlay rename to samples/basic/blinky_pwm/boards/xiao_esp32s3_procpu.overlay diff --git a/samples/bluetooth/hci_uart/boards/yd_esp32.conf b/samples/bluetooth/hci_uart/boards/yd_esp32_procpu.conf similarity index 100% rename from samples/bluetooth/hci_uart/boards/yd_esp32.conf rename to samples/bluetooth/hci_uart/boards/yd_esp32_procpu.conf diff --git a/samples/bluetooth/hci_uart/boards/yd_esp32.overlay b/samples/bluetooth/hci_uart/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/bluetooth/hci_uart/boards/yd_esp32.overlay rename to samples/bluetooth/hci_uart/boards/yd_esp32_procpu.overlay diff --git a/samples/boards/esp32/deep_sleep/boards/yd_esp32.conf b/samples/boards/esp32/deep_sleep/boards/yd_esp32_procpu.conf similarity index 100% rename from samples/boards/esp32/deep_sleep/boards/yd_esp32.conf rename to samples/boards/esp32/deep_sleep/boards/yd_esp32_procpu.conf diff --git a/samples/boards/esp32/ethernet/boards/esp32_ethernet_kit.overlay b/samples/boards/esp32/ethernet/boards/esp32_ethernet_kit_procpu.overlay similarity index 100% rename from samples/boards/esp32/ethernet/boards/esp32_ethernet_kit.overlay rename to samples/boards/esp32/ethernet/boards/esp32_ethernet_kit_procpu.overlay diff --git a/samples/boards/esp32/flash_encryption/boards/yd_esp32.overlay b/samples/boards/esp32/flash_encryption/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/boards/esp32/flash_encryption/boards/yd_esp32.overlay rename to samples/boards/esp32/flash_encryption/boards/yd_esp32_procpu.overlay diff --git a/samples/drivers/adc/boards/esp32s3_devkitm.overlay b/samples/drivers/adc/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/drivers/adc/boards/esp32s3_devkitm.overlay rename to samples/drivers/adc/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/drivers/adc/boards/esp32s3_luatos_core.overlay b/samples/drivers/adc/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from samples/drivers/adc/boards/esp32s3_luatos_core.overlay rename to samples/drivers/adc/boards/esp32s3_luatos_core_procpu.overlay diff --git a/samples/drivers/adc/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/samples/drivers/adc/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from samples/drivers/adc/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to samples/drivers/adc/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/samples/drivers/adc/boards/xiao_esp32s3.overlay b/samples/drivers/adc/boards/xiao_esp32s3_procpu.overlay similarity index 100% rename from samples/drivers/adc/boards/xiao_esp32s3.overlay rename to samples/drivers/adc/boards/xiao_esp32s3_procpu.overlay diff --git a/samples/drivers/adc/boards/yd_esp32.overlay b/samples/drivers/adc/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/drivers/adc/boards/yd_esp32.overlay rename to samples/drivers/adc/boards/yd_esp32_procpu.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32s3_devkitm.overlay b/samples/drivers/counter/alarm/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32s3_devkitm.overlay rename to samples/drivers/counter/alarm/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core.overlay b/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32s3_luatos_core.overlay rename to samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu.overlay diff --git a/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to samples/drivers/counter/alarm/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/samples/drivers/counter/alarm/boards/yd_esp32.overlay b/samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/drivers/counter/alarm/boards/yd_esp32.overlay rename to samples/drivers/counter/alarm/boards/yd_esp32_procpu.overlay diff --git a/samples/drivers/dac/boards/yd_esp32.overlay b/samples/drivers/dac/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/drivers/dac/boards/yd_esp32.overlay rename to samples/drivers/dac/boards/yd_esp32_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom_esp32_procpu.overlay b/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom_esp32_procpu.overlay rename to samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wroom_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover_esp32_procpu.overlay b/samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover_esp32_procpu.overlay rename to samples/drivers/ipm/ipm_esp32/boards/esp32_devkitc_wrover_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm_esp32s3_procpu.overlay b/samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm_esp32s3_procpu.overlay rename to samples/drivers/ipm/ipm_esp32/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/drivers/ipm/ipm_esp32/boards/yd_esp32_esp32_procpu.overlay b/samples/drivers/ipm/ipm_esp32/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/drivers/ipm/ipm_esp32/boards/yd_esp32_esp32_procpu.overlay rename to samples/drivers/ipm/ipm_esp32/boards/yd_esp32_procpu.overlay diff --git a/samples/drivers/led_strip/boards/esp32s3_devkitm_esp32s3_procpu.overlay b/samples/drivers/led_strip/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/drivers/led_strip/boards/esp32s3_devkitm_esp32s3_procpu.overlay rename to samples/drivers/led_strip/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/modules/lvgl/demos/boards/m5stack_core2.conf b/samples/modules/lvgl/demos/boards/m5stack_core2_procpu.conf similarity index 100% rename from samples/modules/lvgl/demos/boards/m5stack_core2.conf rename to samples/modules/lvgl/demos/boards/m5stack_core2_procpu.conf diff --git a/samples/net/wifi/boards/esp32s3_devkitm.conf b/samples/net/wifi/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from samples/net/wifi/boards/esp32s3_devkitm.conf rename to samples/net/wifi/boards/esp32s3_devkitm_procpu.conf diff --git a/samples/net/wifi/boards/esp32s3_devkitm.overlay b/samples/net/wifi/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/net/wifi/boards/esp32s3_devkitm.overlay rename to samples/net/wifi/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/net/wifi/boards/esp32s3_luatos_core.conf b/samples/net/wifi/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from samples/net/wifi/boards/esp32s3_luatos_core.conf rename to samples/net/wifi/boards/esp32s3_luatos_core_procpu.conf diff --git a/samples/net/wifi/boards/esp32s3_luatos_core.overlay b/samples/net/wifi/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from samples/net/wifi/boards/esp32s3_luatos_core.overlay rename to samples/net/wifi/boards/esp32s3_luatos_core_procpu.overlay diff --git a/samples/net/wifi/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/samples/net/wifi/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from samples/net/wifi/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to samples/net/wifi/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/samples/net/wifi/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/samples/net/wifi/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from samples/net/wifi/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to samples/net/wifi/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/samples/net/wifi/boards/xiao_esp32s3.conf b/samples/net/wifi/boards/xiao_esp32s3_procpu.conf similarity index 100% rename from samples/net/wifi/boards/xiao_esp32s3.conf rename to samples/net/wifi/boards/xiao_esp32s3_procpu.conf diff --git a/samples/net/wifi/boards/xiao_esp32s3.overlay b/samples/net/wifi/boards/xiao_esp32s3_procpu.overlay similarity index 100% rename from samples/net/wifi/boards/xiao_esp32s3.overlay rename to samples/net/wifi/boards/xiao_esp32s3_procpu.overlay diff --git a/samples/net/wifi/boards/yd_esp32.conf b/samples/net/wifi/boards/yd_esp32_procpu.conf similarity index 100% rename from samples/net/wifi/boards/yd_esp32.conf rename to samples/net/wifi/boards/yd_esp32_procpu.conf diff --git a/samples/net/wifi/boards/yd_esp32.overlay b/samples/net/wifi/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/net/wifi/boards/yd_esp32.overlay rename to samples/net/wifi/boards/yd_esp32_procpu.overlay diff --git a/samples/sensor/die_temp_polling/boards/esp32s3_devkitm.overlay b/samples/sensor/die_temp_polling/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/sensor/die_temp_polling/boards/esp32s3_devkitm.overlay rename to samples/sensor/die_temp_polling/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/sensor/grow_r502a/boards/yd_esp32.overlay b/samples/sensor/grow_r502a/boards/yd_esp32_procpu.overlay similarity index 100% rename from samples/sensor/grow_r502a/boards/yd_esp32.overlay rename to samples/sensor/grow_r502a/boards/yd_esp32_procpu.overlay diff --git a/samples/sensor/qdec/boards/esp32s3_devkitm.overlay b/samples/sensor/qdec/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/sensor/qdec/boards/esp32s3_devkitm.overlay rename to samples/sensor/qdec/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/sensor/qdec/boards/esp32s3_luatos_core.overlay b/samples/sensor/qdec/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from samples/sensor/qdec/boards/esp32s3_luatos_core.overlay rename to samples/sensor/qdec/boards/esp32s3_luatos_core_procpu.overlay diff --git a/samples/sensor/qdec/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/samples/sensor/qdec/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from samples/sensor/qdec/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to samples/sensor/qdec/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/samples/subsys/display/lvgl/boards/m5stack_core2.conf b/samples/subsys/display/lvgl/boards/m5stack_core2_procpu.conf similarity index 100% rename from samples/subsys/display/lvgl/boards/m5stack_core2.conf rename to samples/subsys/display/lvgl/boards/m5stack_core2_procpu.conf diff --git a/samples/subsys/fs/fs_sample/boards/esp_wrover_kit_esp32_procpu.conf b/samples/subsys/fs/fs_sample/boards/esp_wrover_kit_procpu.conf similarity index 100% rename from samples/subsys/fs/fs_sample/boards/esp_wrover_kit_esp32_procpu.conf rename to samples/subsys/fs/fs_sample/boards/esp_wrover_kit_procpu.conf diff --git a/samples/subsys/fs/fs_sample/boards/esp_wrover_kit_esp32_procpu.overlay b/samples/subsys/fs/fs_sample/boards/esp_wrover_kit_procpu.overlay similarity index 100% rename from samples/subsys/fs/fs_sample/boards/esp_wrover_kit_esp32_procpu.overlay rename to samples/subsys/fs/fs_sample/boards/esp_wrover_kit_procpu.overlay diff --git a/samples/subsys/input/input_dump/boards/esp32s3_devkitm.overlay b/samples/subsys/input/input_dump/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from samples/subsys/input/input_dump/boards/esp32s3_devkitm.overlay rename to samples/subsys/input/input_dump/boards/esp32s3_devkitm_procpu.overlay diff --git a/samples/subsys/settings/boards/esp32s3_devkitm.conf b/samples/subsys/settings/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from samples/subsys/settings/boards/esp32s3_devkitm.conf rename to samples/subsys/settings/boards/esp32s3_devkitm_procpu.conf diff --git a/samples/subsys/settings/boards/esp32s3_luatos_core.conf b/samples/subsys/settings/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from samples/subsys/settings/boards/esp32s3_luatos_core.conf rename to samples/subsys/settings/boards/esp32s3_luatos_core_procpu.conf diff --git a/samples/subsys/settings/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from samples/subsys/settings/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to samples/subsys/settings/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/samples/subsys/settings/boards/yd_esp32.conf b/samples/subsys/settings/boards/yd_esp32_procpu.conf similarity index 100% rename from samples/subsys/settings/boards/yd_esp32.conf rename to samples/subsys/settings/boards/yd_esp32_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32s2_devkitc.conf b/tests/drivers/adc/adc_api/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s2_devkitc.conf rename to tests/drivers/adc/adc_api/boards/esp32s3_devkitm_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32s3_devkitm.overlay b/tests/drivers/adc/adc_api/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s3_devkitm.overlay rename to tests/drivers/adc/adc_api/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/adc/adc_api/boards/esp32s3_devkitm.conf b/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s3_devkitm.conf rename to tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core.overlay b/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s3_luatos_core.overlay rename to tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core.conf b/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s3_luatos_core.conf rename to tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/adc/adc_api/boards/esp_wrover_kit_esp32_procpu.conf b/tests/drivers/adc/adc_api/boards/esp_wrover_kit_esp32_procpu.conf deleted file mode 100644 index b6c5c80f92..0000000000 --- a/tests/drivers/adc/adc_api/boards/esp_wrover_kit_esp32_procpu.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ADC_ASYNC=n diff --git a/tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/tests/drivers/adc/adc_api/boards/esp_wrover_kit_procpu.conf similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to tests/drivers/adc/adc_api/boards/esp_wrover_kit_procpu.conf diff --git a/tests/drivers/adc/adc_api/boards/esp_wrover_kit_esp32_procpu.overlay b/tests/drivers/adc/adc_api/boards/esp_wrover_kit_procpu.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp_wrover_kit_esp32_procpu.overlay rename to tests/drivers/adc/adc_api/boards/esp_wrover_kit_procpu.overlay diff --git a/tests/drivers/adc/adc_api/boards/yd_esp32_esp32_procpu.overlay b/tests/drivers/adc/adc_api/boards/yd_esp32_esp32_procpu.overlay deleted file mode 100644 index c288312aa3..0000000000 --- a/tests/drivers/adc/adc_api/boards/yd_esp32_esp32_procpu.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/esp32s2_devkitc.overlay b/tests/drivers/adc/adc_api/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/esp32s2_devkitc.overlay rename to tests/drivers/adc/adc_api/boards/yd_esp32_procpu.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32s3_devkitm.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/esp32s3_devkitm.overlay rename to tests/drivers/counter/counter_basic_api/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core.overlay rename to tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/counter/counter_basic_api/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/counter/counter_basic_api/boards/yd_esp32.overlay b/tests/drivers/counter/counter_basic_api/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/yd_esp32.overlay rename to tests/drivers/counter/counter_basic_api/boards/yd_esp32_procpu.overlay diff --git a/tests/drivers/dac/dac_api/boards/esp_wrover_kit.overlay b/tests/drivers/dac/dac_api/boards/esp_wrover_kit_procpu.overlay similarity index 100% rename from tests/drivers/dac/dac_api/boards/esp_wrover_kit.overlay rename to tests/drivers/dac/dac_api/boards/esp_wrover_kit_procpu.overlay diff --git a/tests/drivers/dac/dac_api/boards/yd_esp32.overlay b/tests/drivers/dac/dac_api/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/drivers/dac/dac_api/boards/yd_esp32.overlay rename to tests/drivers/dac/dac_api/boards/yd_esp32_procpu.overlay diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm.conf b/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm.conf rename to tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm_procpu.conf diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm.overlay b/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm.overlay rename to tests/drivers/dma/chan_blen_transfer/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core.conf b/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core.conf rename to tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu.conf diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core.overlay b/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core.overlay rename to tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/dma/chan_blen_transfer/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm.conf b/tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm.conf rename to tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm_procpu.conf diff --git a/tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm.overlay b/tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm.overlay rename to tests/drivers/dma/loop_transfer/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core.conf b/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core.conf rename to tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu.conf diff --git a/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core.overlay b/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core.overlay rename to tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/dma/loop_transfer/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32s3_devkitm.overlay b/tests/drivers/gpio/gpio_basic_api/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/esp32s3_devkitm.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core.overlay b/tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/yd_esp32.overlay b/tests/drivers/gpio/gpio_basic_api/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/yd_esp32.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/yd_esp32_procpu.overlay diff --git a/tests/drivers/pwm/pwm_api/boards/esp32s3_devkitm.overlay b/tests/drivers/pwm/pwm_api/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_api/boards/esp32s3_devkitm.overlay rename to tests/drivers/pwm/pwm_api/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core.overlay b/tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core.overlay rename to tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/pwm/pwm_api/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_devkitm.overlay b/tests/drivers/pwm/pwm_loopback/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_loopback/boards/esp32s3_devkitm.overlay rename to tests/drivers/pwm/pwm_loopback/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core.overlay b/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core.overlay rename to tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/pwm/pwm_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/pwm/pwm_loopback/boards/yd_esp32.overlay b/tests/drivers/pwm/pwm_loopback/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/drivers/pwm/pwm_loopback/boards/yd_esp32.overlay rename to tests/drivers/pwm/pwm_loopback/boards/yd_esp32_procpu.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm.conf b/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm.conf rename to tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.conf diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm.overlay b/tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm.overlay rename to tests/drivers/spi/spi_loopback/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core.conf b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core.conf rename to tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.conf diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core.overlay b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core.overlay rename to tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/spi/spi_loopback/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb.conf b/tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb_procpu.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb.conf rename to tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb_procpu.conf diff --git a/tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb.overlay b/tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb_procpu.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb.overlay rename to tests/drivers/spi/spi_loopback/boards/olimex_esp32_evb_procpu.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/yd_esp32.conf b/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/yd_esp32.conf rename to tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.conf diff --git a/tests/drivers/spi/spi_loopback/boards/yd_esp32.overlay b/tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/yd_esp32.overlay rename to tests/drivers/spi/spi_loopback/boards/yd_esp32_procpu.overlay diff --git a/tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm.conf b/tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm_procpu.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm.conf rename to tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm_procpu.conf diff --git a/tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm.overlay b/tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm.overlay rename to tests/drivers/uart/uart_async_api/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu.conf b/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu.conf rename to tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu.conf diff --git a/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu.overlay b/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu.overlay rename to tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf b/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu_usb.conf similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.conf rename to tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu_usb.conf diff --git a/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/drivers/uart/uart_async_api/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm_procpu.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm.overlay rename to tests/subsys/debug/coredump_backends/boards/esp32s3_devkitm_procpu.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core.overlay rename to tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay b/tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu_usb.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_esp32s3_procpu_usb.overlay rename to tests/subsys/debug/coredump_backends/boards/esp32s3_luatos_core_procpu_usb.overlay diff --git a/tests/subsys/debug/coredump_backends/boards/yd_esp32.overlay b/tests/subsys/debug/coredump_backends/boards/yd_esp32_procpu.overlay similarity index 100% rename from tests/subsys/debug/coredump_backends/boards/yd_esp32.overlay rename to tests/subsys/debug/coredump_backends/boards/yd_esp32_procpu.overlay