denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

board: Rename virt_qemu to virt_qemu_<arch>

Browse Source 
Instead of having a generic "virt_qemu" board use "virt_qemu_<arch>" in
order to have a clean distinction between boards. Current supported
boards are "virt_qemu_arm_v7a", "virt_qemu_arm_v8a", and
"virt_qemu_riscv".

issue #4034
This commit is contained in:
Sebastian Sumpf
2022-08-09 13:32:38 +02:00
committed by Christian Helmuth
parent c462720c28
commit b5c780993c
70 changed files with 85 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tool/builddir/build.conf/run_arm_v7
View File

@@ -5,13 +5,13 @@ QEMU_RUN_OPT := --include power_on/qemu --include log/qemu
#KERNEL ?= hw
# board to use (imx53_qsb, imx53_qsb_tz, imx6q_sabrelite, imx7d_sabre,
# nit6_solox, pbxa9, usb_armory, virt_qemu, wand_quad,
# nit6_solox, pbxa9, usb_armory, virt_qemu_arm_v7a, wand_quad,
# or zynq_qemu)
#BOARD ?= pbxa9
# local variable for run-tool arguments that depend on the used board
BOARD_RUN_OPT(pbxa9) = $(QEMU_RUN_OPT)
BOARD_RUN_OPT(virt_qemu) = $(QEMU_RUN_OPT)
BOARD_RUN_OPT(pbxa9) = $(QEMU_RUN_OPT)
BOARD_RUN_OPT(virt_qemu_arm_v7a) = $(QEMU_RUN_OPT)
##
## Qemu arguments, effective when using the run tool's 'power_on/qemu' back end

6
tool/builddir/build.conf/run_arm_v8
View File

@@ -8,9 +8,9 @@ QEMU_RUN_OPT := --include power_on/qemu --include log/qemu
#BOARD ?= rpi3
# local variable for run-tool arguments that depend on the used board
BOARD_RUN_OPT(linux) := --include power_on/linux --include log/linux
BOARD_RUN_OPT(rpi3) := $(QEMU_RUN_OPT)
BOARD_RUN_OPT(virt_qemu) := $(QEMU_RUN_OPT)
BOARD_RUN_OPT(linux) := --include power_on/linux --include log/linux
BOARD_RUN_OPT(rpi3) := $(QEMU_RUN_OPT)
BOARD_RUN_OPT(virt_qemu_arm_v8a) := $(QEMU_RUN_OPT)
##
## Qemu arguments, effective when using the run tool's 'power_on/qemu' back end

4
tool/builddir/build.conf/run_riscv
View File

@@ -5,7 +5,7 @@ QEMU_RUN_OPT := --include power_on/qemu --include log/qemu
KERNEL ?= hw
# board to use (riscv_qemu)
BOARD ?= riscv_qemu
BOARD ?= virt_qemu_riscv
# local variable for run-tool arguments that depend on the used board
BOARD_RUN_OPT(riscv_qemu) = $(QEMU_RUN_OPT)
BOARD_RUN_OPT(virt_qemu_riscv) = $(QEMU_RUN_OPT)

7
tool/run/power_on/qemu
View File

@@ -54,18 +54,11 @@ proc board_qemu_args { } {
##
# Each line is appended to qemu_args.
# Arguments might be general or restricted to a particular spec as follows:
# general arguments
# arm_v7a: arguments for arm_v7a
#
set qemu_args ""
foreach line [split $file_content "\n"] {
if {[regexp {^([\w]+):(.*)$} $line dummy spec arg]} {
if {[have_spec $spec]} { append qemu_args " $arg" }
} else {
# general arguments
append qemu_args " $line"
}
}
return $qemu_args