metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Add qemu-gdb target 

Refactor QEMU runners.
This commit is contained in:
Berkus Decker 2020-11-14 17:04:55 +02:00
parent 91e8652abc
commit e8da38e04f
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Justfile
View File

@ -2,6 +2,10 @@ qemu:
# Build and run kernel in QEMU # Build and run kernel in QEMU
cargo make qemu cargo make qemu
qemu-gdb:
# Build and run kernel in QEMU with GDB port enabled
cargo make qemu-gdb
device: device:
# Build and write kernel to an SD Card # Build and write kernel to an SD Card
cargo make sdcard cargo make sdcard

18
nucleus/Makefile.toml
View File

@ -50,16 +50,20 @@ env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" }
command = "cargo" command = "cargo"
args = ["build", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"] args = ["build", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"]
[tasks.qemu] [tasks.qemu-runner]
dependencies = ["build-qemu", "kernel-binary"]
env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" } env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" }
script_runner = "@duckscript"
script = [ script = [
''' "${QEMU} ${QEMU_OPTS} ${QEMU_RUNNER_OPTS} -dtb ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb -kernel ${KERNEL_BIN}"
binaryFile = basename ${CARGO_MAKE_TASK_ARGS}
exec --fail-on-error ${QEMU} %{QEMU_OPTS} %{QEMU_SERIAL} -dtb ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb -kernel ${KERNEL_BIN}
'''
] ]
dependencies = ["build-qemu", "kernel-binary"]
[tasks.qemu]
extend = "qemu-runner"
env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS}" }
[tasks.qemu-gdb]
extend = "qemu-runner"
env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_GDB_OPTS}" }
[tasks.openocd] [tasks.openocd]
dependencies = ["build", "kernel-binary"] dependencies = ["build", "kernel-binary"]