From 503f43d98354cce871dadd2c21f1759170907953 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Sun, 28 Feb 2021 13:39:00 +0200 Subject: [PATCH] build(tools): Enable target board selection --- Makefile.toml | 3 +++ nucleus/Makefile.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.toml b/Makefile.toml index 78dfad8..510bad8 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -17,6 +17,9 @@ DEFAULT_TARGET = "aarch64-vesper-metta" # Pass TARGET env var if it does not match the default target above. TARGET = { value = "${DEFAULT_TARGET}", condition = { env_not_set = ["TARGET"] } } +# Name of the target board "rpi3" or "rpi4" +TARGET_BOARD = { value = "rpi4", condition = { env_not_set = ["TARGET_BOARD"] } } + # AArch64 QEMU binary QEMU = { value = "qemu-system-aarch64", condition = { env_not_set = ["QEMU"] } } diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml index 8278677..8bf10e2 100644 --- a/nucleus/Makefile.toml +++ b/nucleus/Makefile.toml @@ -87,7 +87,7 @@ env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_GDB_OPTS}" } [tasks.openocd] dependencies = ["build", "kernel-binary"] script = [ - "${OPENOCD} -f interface/jlink.cfg -f ../ocd/rpi4_target.cfg" + "${OPENOCD} -f interface/jlink.cfg -f ../ocd/${TARGET_BOARD}_target.cfg" ] [tasks.gdb-config]