diff --git a/Makefile.toml b/Makefile.toml index 7386667..e31dd08 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -19,6 +19,8 @@ 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"] } } +# Name of the DTB file for target board configuration, use bcm2710-rpi-3-b-plus.dtb for RasPi3B+ +TARGET_DTB = { value = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2711-rpi-4-b.dtb", condition = { env_not_set = ["TARGET_DTB"] } } # AArch64 QEMU binary QEMU = { value = "qemu-system-aarch64", condition = { env_not_set = ["QEMU"] } } @@ -163,6 +165,7 @@ script = [ appendfile ${ZELLIJ_CONFIG_FILE} "QEMU_OPTS=\"${QEMU_OPTS}\"\n" appendfile ${ZELLIJ_CONFIG_FILE} "QEMU_RUNNER_OPTS=${QEMU_RUNNER_OPTS}\n" appendfile ${ZELLIJ_CONFIG_FILE} "CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY=${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}\n" + appendfile ${ZELLIJ_CONFIG_FILE} "TARGET_DTB=${TARGET_DTB}\n" appendfile ${ZELLIJ_CONFIG_FILE} "KERNEL_BIN=${KERNEL_BIN}\n" ''' ] diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml index b564a60..c7d8fe6 100644 --- a/nucleus/Makefile.toml +++ b/nucleus/Makefile.toml @@ -11,16 +11,16 @@ run_task = "custom-binary" dependencies = ["build-qemu", "kernel-binary"] env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" } script = [ - "${QEMU} ${QEMU_OPTS} ${QEMU_RUNNER_OPTS} -dtb ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb -kernel ${KERNEL_BIN}" + "${QEMU} ${QEMU_OPTS} ${QEMU_RUNNER_OPTS} -dtb ${TARGET_DTB} -kernel ${KERNEL_BIN}" ] [tasks.qemu] extend = "qemu-runner" -env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS}" } +env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" } [tasks.qemu-gdb] extend = "qemu-runner" -env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_GDB_OPTS}" } +env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_GDB_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" } [tasks.zellij-nucleus] env = { "KERNEL_BIN" = "${KERNEL_BIN}" } diff --git a/targets/bcm2711-rpi-4-b.dtb b/targets/bcm2711-rpi-4-b.dtb new file mode 100755 index 0000000..772001f Binary files /dev/null and b/targets/bcm2711-rpi-4-b.dtb differ diff --git a/targets/bcm2711-rpi-400.dtb b/targets/bcm2711-rpi-400.dtb new file mode 100755 index 0000000..d3e570a Binary files /dev/null and b/targets/bcm2711-rpi-400.dtb differ