From efe0887247294a71e70cbea95ab730ac4bd89e69 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 13 Jun 2019 14:35:33 +0200 Subject: [PATCH] tool: fix BOARD_RUN_OPT for arm_v8 --- tool/builddir/build.conf/run_arm_v7 | 2 +- tool/builddir/build.conf/run_arm_v8 | 6 ++---- tool/builddir/build.conf/run_riscv | 2 +- tool/builddir/build.conf/run_x86_32 | 2 +- tool/builddir/build.conf/run_x86_64 | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tool/builddir/build.conf/run_arm_v7 b/tool/builddir/build.conf/run_arm_v7 index 18b89dba4..a83a48b14 100644 --- a/tool/builddir/build.conf/run_arm_v7 +++ b/tool/builddir/build.conf/run_arm_v7 @@ -9,7 +9,7 @@ QEMU_RUN_OPT := --include power_on/qemu --include log/qemu # wand_quad, or zynq_qemu) #BOARD ?= pbxa9 -# local varible for run-tool arguments that depend on the used board +# local variable for run-tool arguments that depend on the used board BOARD_RUN_OPT(pbxa9) = $(QEMU_RUN_OPT) BOARD_RUN_OPT(zynq_qemu) = $(QEMU_RUN_OPT) diff --git a/tool/builddir/build.conf/run_arm_v8 b/tool/builddir/build.conf/run_arm_v8 index ef7e085a5..dd6a6e705 100644 --- a/tool/builddir/build.conf/run_arm_v8 +++ b/tool/builddir/build.conf/run_arm_v8 @@ -7,10 +7,8 @@ QEMU_RUN_OPT := --include power_on/qemu --include log/qemu # board to use (rpi3) #BOARD ?= rpi3 -# local varible for run-tool arguments that depend on the used kernel -KERNEL_RUN_OPT(hw) := $(QEMU_RUN_OPT) -KERNEL_RUN_OPT(foc) := $(QEMU_RUN_OPT) -KERNEL_RUN_OPT(sel4) := $(QEMU_RUN_OPT) +# local variable for run-tool arguments that depend on the used board +BOARD_RUN_OPT(rpi3) := $(QEMU_RUN_OPT) ## ## Qemu arguments, effective when using the run tool's 'power_on/qemu' back end diff --git a/tool/builddir/build.conf/run_riscv b/tool/builddir/build.conf/run_riscv index b8b5c5466..50c0a9182 100644 --- a/tool/builddir/build.conf/run_riscv +++ b/tool/builddir/build.conf/run_riscv @@ -4,6 +4,6 @@ KERNEL ?= hw # board to use BOARD ?= spike -# local varible for run-tool arguments that depend on the used board +# local variable for run-tool arguments that depend on the used board BOARD_RUN_OPT(spike) = --include image/bbl --include power_on/spike --include log/spike diff --git a/tool/builddir/build.conf/run_x86_32 b/tool/builddir/build.conf/run_x86_32 index 40f53d037..7a0691eb7 100644 --- a/tool/builddir/build.conf/run_x86_32 +++ b/tool/builddir/build.conf/run_x86_32 @@ -4,7 +4,7 @@ # board to use (pc, or linux) BOARD ?= pc -# local varible for run-tool arguments that depend on the used board +# local variable for run-tool arguments that depend on the used board BOARD_RUN_OPT(pc) = $(QEMU_RUN_OPT) BOARD_RUN_OPT(linux) = --include power_on/linux --include log/linux diff --git a/tool/builddir/build.conf/run_x86_64 b/tool/builddir/build.conf/run_x86_64 index 507faacac..54dc1e93d 100644 --- a/tool/builddir/build.conf/run_x86_64 +++ b/tool/builddir/build.conf/run_x86_64 @@ -4,7 +4,7 @@ # board to use (pc, linux, or muen) BOARD ?= pc -# local varible for run-tool arguments that depend on the used board +# local variable for run-tool arguments that depend on the used board BOARD_RUN_OPT(muen) = --include image/muen BOARD_RUN_OPT(muen) += --image-muen-hardware hardware/lenovo-t430s.xml BOARD_RUN_OPT(muen) += --image-muen-platform platform/lenovo-t430s.xml