From 84c12ab5b5faf478cd264e090ffc4912048813e7 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Wed, 12 Jun 2024 10:01:28 -0700 Subject: [PATCH] boards: rename qemu_xtensa to qemu_xtensa/dc233c This is in preparation for adding another SoC where qemu_xtensa is no longer valid choice. So use qemu_xtensa/dc233c as it is the same as the old qemu_xtensa. Signed-off-by: Daniel Leung --- boards/deprecated.cmake | 3 +++ boards/qemu/xtensa/doc/index.rst | 2 +- .../xtensa/{qemu_xtensa.dts => qemu_xtensa_dc233c.dts} | 0 .../xtensa/{qemu_xtensa.yaml => qemu_xtensa_dc233c.yaml} | 2 +- ...qemu_xtensa_defconfig => qemu_xtensa_dc233c_defconfig} | 0 doc/releases/migration-guide-4.0.rst | 2 ++ samples/subsys/llext/modules/README.rst | 4 ++-- samples/subsys/llext/modules/sample.yaml | 4 ++-- .../portability/cmsis_rtos_v1/philosophers/src/main.c | 2 +- .../portability/cmsis_rtos_v2/philosophers/sample.yaml | 2 +- .../application_development/code_relocation/testcase.yaml | 2 +- tests/kernel/cache/testcase.yaml | 4 ++-- tests/lib/heap/testcase.yaml | 4 ++-- tests/lib/mpsc_pbuf/testcase.yaml | 3 ++- tests/posix/shm/testcase.yaml | 2 +- tests/subsys/debug/symtab/testcase.yaml | 2 +- tests/subsys/llext/simple/testcase.yaml | 8 ++++---- 17 files changed, 26 insertions(+), 20 deletions(-) rename boards/qemu/xtensa/{qemu_xtensa.dts => qemu_xtensa_dc233c.dts} (100%) rename boards/qemu/xtensa/{qemu_xtensa.yaml => qemu_xtensa_dc233c.yaml} (85%) rename boards/qemu/xtensa/{qemu_xtensa_defconfig => qemu_xtensa_dc233c_defconfig} (100%) diff --git a/boards/deprecated.cmake b/boards/deprecated.cmake index a96f68b12da..84d5f3c768e 100644 --- a/boards/deprecated.cmake +++ b/boards/deprecated.cmake @@ -721,6 +721,9 @@ set(qemu_x86_virt_DEPRECATED set(qemu_x86_xip_DEPRECATED qemu_x86/atom/xip ) +set(qemu_xtensa_DEPRECATED + qemu_xtensa/dc233c +) set(qemu_xtensa_mmu_DEPRECATED qemu_xtensa/dc233c/mmu ) diff --git a/boards/qemu/xtensa/doc/index.rst b/boards/qemu/xtensa/doc/index.rst index 1bc8b2b2ace..f0ec7e9deec 100644 --- a/boards/qemu/xtensa/doc/index.rst +++ b/boards/qemu/xtensa/doc/index.rst @@ -18,7 +18,7 @@ emulated environment, for example, with the :zephyr:code-sample:`synchronization .. zephyr-app-commands:: :zephyr-app: samples/synchronization :host-os: unix - :board: qemu_xtensa + :board: qemu_xtensa/dc233c :goals: run This will build an image with the synchronization sample app, boot it using diff --git a/boards/qemu/xtensa/qemu_xtensa.dts b/boards/qemu/xtensa/qemu_xtensa_dc233c.dts similarity index 100% rename from boards/qemu/xtensa/qemu_xtensa.dts rename to boards/qemu/xtensa/qemu_xtensa_dc233c.dts diff --git a/boards/qemu/xtensa/qemu_xtensa.yaml b/boards/qemu/xtensa/qemu_xtensa_dc233c.yaml similarity index 85% rename from boards/qemu/xtensa/qemu_xtensa.yaml rename to boards/qemu/xtensa/qemu_xtensa_dc233c.yaml index 1190d0d3f8e..a3ac9b1ca4f 100644 --- a/boards/qemu/xtensa/qemu_xtensa.yaml +++ b/boards/qemu/xtensa/qemu_xtensa_dc233c.yaml @@ -1,4 +1,4 @@ -identifier: qemu_xtensa +identifier: qemu_xtensa/dc233c name: QEMU Emulation for Xtensa type: qemu simulation: qemu diff --git a/boards/qemu/xtensa/qemu_xtensa_defconfig b/boards/qemu/xtensa/qemu_xtensa_dc233c_defconfig similarity index 100% rename from boards/qemu/xtensa/qemu_xtensa_defconfig rename to boards/qemu/xtensa/qemu_xtensa_dc233c_defconfig diff --git a/doc/releases/migration-guide-4.0.rst b/doc/releases/migration-guide-4.0.rst index 5444f426fe1..e8c09adbb3b 100644 --- a/doc/releases/migration-guide-4.0.rst +++ b/doc/releases/migration-guide-4.0.rst @@ -35,6 +35,8 @@ Boards * STM32WBA: The command used for fetching blobs required to build ble applications is now ``west blobs fetch hal_stm32`` instead of ``west blobs fetch stm32``. +* Board ``qemu_xtensa`` is deprecated. Use ``qemu_xtensa/dc233c`` instead. + STM32 ===== diff --git a/samples/subsys/llext/modules/README.rst b/samples/subsys/llext/modules/README.rst index 58dc540f729..4149dffab25 100644 --- a/samples/subsys/llext/modules/README.rst +++ b/samples/subsys/llext/modules/README.rst @@ -41,7 +41,7 @@ Building and running .. zephyr-app-commands:: :zephyr-app: samples/subsys/llext/modules - :board: qemu_xtensa + :board: qemu_xtensa/dc233c :goals: build run :compact: @@ -50,7 +50,7 @@ Building and running .. zephyr-app-commands:: :zephyr-app: samples/subsys/llext/modules - :board: qemu_xtensa + :board: qemu_xtensa/dc233c :goals: build run :west-args: -T sample.llext.modules.module_build :compact: diff --git a/samples/subsys/llext/modules/sample.yaml b/samples/subsys/llext/modules/sample.yaml index 955c4abbad7..4fc5d4005aa 100644 --- a/samples/subsys/llext/modules/sample.yaml +++ b/samples/subsys/llext/modules/sample.yaml @@ -6,9 +6,9 @@ common: - qemu_cortex_a53 # ARM Cortex-A53 (ARMv8-A ISA) - mps2/an385 # ARM Cortex-M3 (ARMv7-M ISA) - mps2/an521/cpu0 # ARM Cortex-M33 (ARMv8-M ISA) - - qemu_xtensa + - qemu_xtensa/dc233c integration_platforms: - - qemu_xtensa + - qemu_xtensa/dc233c - mps2/an385 - qemu_cortex_a53 harness: console diff --git a/samples/subsys/portability/cmsis_rtos_v1/philosophers/src/main.c b/samples/subsys/portability/cmsis_rtos_v1/philosophers/src/main.c index ccaa8224c23..b5f22a30350 100644 --- a/samples/subsys/portability/cmsis_rtos_v1/philosophers/src/main.c +++ b/samples/subsys/portability/cmsis_rtos_v1/philosophers/src/main.c @@ -72,7 +72,7 @@ osSemaphoreId forks[NUM_PHIL]; #define fork(x) (forks[x]) /* - * CMSIS limits the stack size, but qemu_x86_64, qemu_xtensa, + * CMSIS limits the stack size, but qemu_x86_64, qemu_xtensa (all), * qemu_leon3 and the boards such as up_squared, intel_ehl_crb, * acrn_ehl_crb need 1024 to run this. * For other arch and boards suggested stack size is 512. diff --git a/samples/subsys/portability/cmsis_rtos_v2/philosophers/sample.yaml b/samples/subsys/portability/cmsis_rtos_v2/philosophers/sample.yaml index af5a69f0af7..801b997fcb1 100644 --- a/samples/subsys/portability/cmsis_rtos_v2/philosophers/sample.yaml +++ b/samples/subsys/portability/cmsis_rtos_v2/philosophers/sample.yaml @@ -8,7 +8,7 @@ common: min_ram: 32 min_flash: 34 platform_exclude: - - qemu_xtensa + - qemu_xtensa/dc233c - qemu_x86_64 harness: console harness_config: diff --git a/tests/application_development/code_relocation/testcase.yaml b/tests/application_development/code_relocation/testcase.yaml index 2fcf97b6aa6..45582025a85 100644 --- a/tests/application_development/code_relocation/testcase.yaml +++ b/tests/application_development/code_relocation/testcase.yaml @@ -37,4 +37,4 @@ tests: - qemu_riscv64 application_development.code_relocation.xtensa: extra_args: CONF_FILE="prj_xtensa.conf" - platform_allow: qemu_xtensa + platform_allow: qemu_xtensa/dc233c diff --git a/tests/kernel/cache/testcase.yaml b/tests/kernel/cache/testcase.yaml index 22cd07fbdac..bb0cc45df07 100644 --- a/tests/kernel/cache/testcase.yaml +++ b/tests/kernel/cache/testcase.yaml @@ -8,7 +8,7 @@ tests: - bcm958402m2/bcm58402/m7 - bcm958401m2 integration_platforms: - - qemu_xtensa + - qemu_xtensa/dc233c - qemu_cortex_a53 - nsim/nsim_em - qemu_x86 @@ -23,7 +23,7 @@ tests: - bcm958402m2/bcm58402/m7 - bcm958401m2 integration_platforms: - - qemu_xtensa + - qemu_xtensa/dc233c - qemu_cortex_a53 - nsim/nsim_em - qemu_x86 diff --git a/tests/lib/heap/testcase.yaml b/tests/lib/heap/testcase.yaml index 279aa0c9a68..d522fd4a59a 100644 --- a/tests/lib/heap/testcase.yaml +++ b/tests/lib/heap/testcase.yaml @@ -3,14 +3,14 @@ # minutes (vs. ~20 seconds for qemu) to complete in CI. There's # little value there, this is a unit test of library code and we have # coverage of the RISC-V architectures via qemu platforms already. -# Excludes qemu_xtensa due to pathological runtimes which cannot be +# Excludes qemu_xtensa/dc233c due to pathological runtimes which cannot be # reproduced on real hardware. tests: libraries.heap: tags: heap platform_exclude: - m2gl025_miv - - qemu_xtensa + - qemu_xtensa/dc233c - esp32s2_saola - esp32s2_lolin_mini timeout: 480 diff --git a/tests/lib/mpsc_pbuf/testcase.yaml b/tests/lib/mpsc_pbuf/testcase.yaml index 124c3a7669c..50d9722e426 100644 --- a/tests/lib/mpsc_pbuf/testcase.yaml +++ b/tests/lib/mpsc_pbuf/testcase.yaml @@ -14,7 +14,8 @@ tests: - qemu_riscv64 - qemu_x86 - qemu_x86_64 - - qemu_xtensa + - qemu_xtensa/dc233c + - native_posix - native_sim integration_platforms: - native_sim diff --git a/tests/posix/shm/testcase.yaml b/tests/posix/shm/testcase.yaml index d0fb52be995..1928a6e177c 100644 --- a/tests/posix/shm/testcase.yaml +++ b/tests/posix/shm/testcase.yaml @@ -9,7 +9,7 @@ common: - simulation platform_exclude: # linker_zephyr_pre0.cmd:140: syntax error (??) - - qemu_xtensa + - qemu_xtensa/dc233c # CONFIG_MMU=y but no arch_mem_map() or arch_mem_unmap() - intel_ish_5_4_1 - intel_ish_5_6_0 diff --git a/tests/subsys/debug/symtab/testcase.yaml b/tests/subsys/debug/symtab/testcase.yaml index e20c196705a..43d4c54a2e4 100644 --- a/tests/subsys/debug/symtab/testcase.yaml +++ b/tests/subsys/debug/symtab/testcase.yaml @@ -5,7 +5,7 @@ common: - qemu_riscv64 - qemu_cortex_a53 - qemu_cortex_m3 - - qemu_xtensa + - qemu_xtensa/dc233c tags: - debug - symtab diff --git a/tests/subsys/llext/simple/testcase.yaml b/tests/subsys/llext/simple/testcase.yaml index 6352e5d30f1..59cdccf6e3a 100644 --- a/tests/subsys/llext/simple/testcase.yaml +++ b/tests/subsys/llext/simple/testcase.yaml @@ -64,7 +64,7 @@ tests: llext.simple.writable: arch_allow: arm xtensa integration_platforms: - - qemu_xtensa # Xtensa ISA + - qemu_xtensa/dc233c # Xtensa ISA filter: not CONFIG_MPU and not CONFIG_MMU and not CONFIG_SOC_SERIES_S32ZE extra_configs: - arch:arm:CONFIG_ARM_MPU=n @@ -73,7 +73,7 @@ tests: llext.simple.writable_relocatable: arch_allow: arm xtensa integration_platforms: - - qemu_xtensa # Xtensa ISA + - qemu_xtensa/dc233c # Xtensa ISA filter: not CONFIG_MPU and not CONFIG_MMU extra_configs: - arch:arm:CONFIG_ARM_MPU=n @@ -86,7 +86,7 @@ tests: llext.simple.writable_slid_linking: arch_allow: arm xtensa integration_platforms: - - qemu_xtensa # Xtensa ISA + - qemu_xtensa/dc233c # Xtensa ISA filter: not CONFIG_MPU and not CONFIG_MMU and not CONFIG_SOC_SERIES_S32ZE extra_configs: - arch:arm:CONFIG_ARM_MPU=n @@ -96,7 +96,7 @@ tests: llext.simple.writable_relocatable_slid_linking: arch_allow: arm xtensa integration_platforms: - - qemu_xtensa # Xtensa ISA + - qemu_xtensa/dc233c # Xtensa ISA filter: not CONFIG_MPU and not CONFIG_MMU extra_configs: - arch:arm:CONFIG_ARM_MPU=n