boards: rename qemu_xtensa to qemu_xtensa/dc233c

dcpleung · dcpleung · commit 6e2bc4379a9c · 2024-09-25T16:53:53.000-07:00
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 &lt;daniel.leung@intel.com&gt;
diff --git 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
@@ -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_dc233c.dts b/boards/qemu/xtensa/qemu_xtensa_dc233c.dts
diff --git a/boards/qemu/xtensa/qemu_xtensa_dc233c.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_dc233c_defconfig b/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -721,6 +721,9 @@ set(qemu_x86_virt_DEPRECATED`
`721`	`721`	`set(qemu_x86_xip_DEPRECATED`
`722`	`722`	`qemu_x86/atom/xip`
`723`	`723`	`)`
	`724`	`+set(qemu_xtensa_DEPRECATED`
	`725`	`+ qemu_xtensa/dc233c`
	`726`	`+)`
`724`	`727`	`set(qemu_xtensa_mmu_DEPRECATED`
`725`	`728`	`qemu_xtensa/dc233c/mmu`
`726`	`729`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-identifier: qemu_xtensa`
	`1`	`+identifier: qemu_xtensa/dc233c`
`2`	`2`	`name: QEMU Emulation for Xtensa`
`3`	`3`	`type: qemu`
`4`	`4`	`simulation: qemu`