Skip to content

Commit a44fd54

Browse files
maass-hamburgmaass-hamburg
committed
boards: qemu: riscv: combine boards into one
combine board into one and use cpu cluster for rv32, rv32e and rv64 variants Signed-off-by: Fin Maaß <f.maass@vogl-electronic.com>
1 parent fbf89bc commit a44fd54

File tree

149 files changed

+184
-767
lines changed

Some content is hidden

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

149 files changed

+184
-767
lines changed

‎boards/deprecated.cmake‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,18 @@ set(scobc_module1_DEPRECATED
7070
set(raytac_an54l15q_db/nrf54l15/cpuapp_DEPRECATED
7171
raytac_an54lq_db_15/nrf54l15/cpuapp
7272
)
73+
set(qemu_riscv32_DEPRECATED
74+
qemu_riscv/qemu_virt_riscv/rv32
75+
)
76+
set(qemu_riscv32/qemu_virt_riscv32/smp_DEPRECATED
77+
qemu_riscv/qemu_virt_riscv/rv32/smp
78+
)
79+
set(qemu_riscv32e_DEPRECATED
80+
qemu_riscv/qemu_virt_riscv/rv32e
81+
)
82+
set(qemu_riscv64_DEPRECATED
83+
qemu_riscv/qemu_virt_riscv/rv64
84+
)
85+
set(qemu_riscv64/qemu_virt_riscv64/smp_DEPRECATED
86+
qemu_riscv/qemu_virt_riscv/rv64/smp
87+
)

‎boards/qemu/riscv/Kconfig.qemu_riscv‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# SPDX-FileCopyrightText: Copyright The Zephyr Project Contributors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
RISCV_ISA_BASE_PROP := riscv,isa-base
5-
64
config BOARD_QEMU_RISCV
7-
select SOC_QEMU_VIRT_RISCV32 if $(dt_node_str_prop_equals,/cpus/cpu@0,$(RISCV_ISA_BASE_PROP),rv32i)
8-
select SOC_QEMU_VIRT_RISCV32E if $(dt_node_str_prop_equals,/cpus/cpu@0,$(RISCV_ISA_BASE_PROP),rv32e)
9-
select SOC_QEMU_VIRT_RISCV64 if $(dt_node_str_prop_equals,/cpus/cpu@0,$(RISCV_ISA_BASE_PROP),rv64i)
5+
select SOC_QEMU_VIRT_RISCV

‎boards/qemu/riscv/board.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ board:
33
full_name: QEMU Emulation for RISCV
44
vendor: qemu
55
socs:
6-
- name: qemu_virt_riscv32
6+
- name: qemu_virt_riscv
77
variants:
88
- name: smp
9-
- name: qemu_virt_riscv32e
10-
- name: qemu_virt_riscv64
11-
variants:
9+
cpucluster: rv32
1210
- name: smp
11+
cpucluster: rv64

‎boards/qemu/riscv/doc/index.rst‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Get the Toolchain and QEMU
1010

1111
The minimum version of the `Zephyr SDK tools
1212
<https://github.com/zephyrproject-rtos/sdk-ng/releases>`_
13-
with toolchain and QEMU support for the RISCV64 architecture is v0.10.2.
13+
with toolchain and QEMU support for the RISCV architecture is v0.10.2.
1414
Please see the :ref:`installation instructions <install-required-tools>`
1515
for more details.
1616

@@ -33,21 +33,21 @@ emulated environment. For example, with the :zephyr:code-sample:`synchronization
3333
.. zephyr-app-commands::
3434
:zephyr-app: samples/synchronization
3535
:host-os: unix
36-
:board: qemu_riscv/qemu_virt_riscv32
36+
:board: qemu_riscv//rv32
3737
:goals: run
3838

3939

4040
.. zephyr-app-commands::
4141
:zephyr-app: samples/synchronization
4242
:host-os: unix
43-
:board: qemu_riscv/qemu_virt_riscv32e
43+
:board: qemu_riscv//rv32e
4444
:goals: run
4545

4646

4747
.. zephyr-app-commands::
4848
:zephyr-app: samples/synchronization
4949
:host-os: unix
50-
:board: qemu_riscv/qemu_virt_riscv64
50+
:board: qemu_riscv//rv64
5151
:goals: run
5252

5353
This will build an image with the synchronization sample app, boot it using
@@ -56,16 +56,16 @@ QEMU, and display the following console output:
5656
.. code-block:: console
5757
5858
***** BOOTING ZEPHYR OS v1.8.99 - BUILD: Jun 27 2017 13:09:26 *****
59-
threadA: Hello World from riscv64!
60-
threadB: Hello World from riscv64!
61-
threadA: Hello World from riscv64!
62-
threadB: Hello World from riscv64!
63-
threadA: Hello World from riscv64!
64-
threadB: Hello World from riscv64!
65-
threadA: Hello World from riscv64!
66-
threadB: Hello World from riscv64!
67-
threadA: Hello World from riscv64!
68-
threadB: Hello World from riscv64!
59+
threadA: Hello World from riscv!
60+
threadB: Hello World from riscv!
61+
threadA: Hello World from riscv!
62+
threadB: Hello World from riscv!
63+
threadA: Hello World from riscv!
64+
threadB: Hello World from riscv!
65+
threadA: Hello World from riscv!
66+
threadB: Hello World from riscv!
67+
threadA: Hello World from riscv!
68+
threadB: Hello World from riscv!
6969
7070
Exit QEMU by pressing :kbd:`CTRL+A` :kbd:`x`.
7171

‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv32e.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv64.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv32.dts‎ renamed to ‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv_rv32.dts‎

File renamed without changes.

‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv32.yaml‎ renamed to ‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv_rv32.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
identifier: qemu_riscv/qemu_virt_riscv32
1+
identifier: qemu_riscv/qemu_virt_riscv/rv32
22
name: QEMU Emulation for RISC-V 32-bit
33
type: qemu
44
simulation:

‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv32_defconfig‎ renamed to ‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv_rv32_defconfig‎

File renamed without changes.

‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv32_smp.dts‎ renamed to ‎boards/qemu/riscv/qemu_riscv_qemu_virt_riscv_rv32_smp.dts‎

File renamed without changes.

0 commit comments

Comments
 (0)