Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Ivan Velickovic <[email protected]>
  • Loading branch information
Ivan-Velickovic committed Aug 7, 2024
1 parent 4db1568 commit 10d814d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
8 changes: 3 additions & 5 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,9 @@ pub fn build(b: *std.Build) void {

break :blk &(src_aarch64 ++ vgic_src);
},
else => &[_][]const u8 {},
// else => {
// std.log.err("Unsupported libvmm architecture given '{s}'", .{ @tagName(target.result.cpu.arch) });
// std.posix.exit(1);
// }
else => {
@panic(b.fmt("Unsupported libvmm architecture given '{s}'", .{ @tagName(target.result.cpu.arch) }));
}
};

const libvmm_flags = &.{
Expand Down
14 changes: 7 additions & 7 deletions examples/virtio/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -301,23 +301,23 @@ pub fn build(b: *Build) void {
);
b.installArtifact(client_vmm);

// UART driver artifact
// Get all of our sDDF artefacts
// UART driver
const uart_driver = switch (microkit_board) {
.qemu_virt_aarch64 => sddf_dep.artifact("driver_uart_arm.elf"),
.odroidc4 => sddf_dep.artifact("driver_uart_meson.elf"),
};
// The system description expects a different name for the UART driver ELF, so we add this extra
// install step.
const uart_driver_install = b.addInstallArtifact(uart_driver, .{ .dest_sub_path = "uart_driver.elf" });
b.getInstallStep().dependOn(&uart_driver_install.step);

// Serial virt TX artifact
// Serial TX virtualiser
const serial_virt_tx = sddf_dep.artifact("serial_virt_tx.elf");
b.installArtifact(serial_virt_tx);

// Serial virt RX artifact
// Serial RX virtualiser
const serial_virt_rx = sddf_dep.artifact("serial_virt_rx.elf");
b.installArtifact(serial_virt_rx);

// Blk virt artifact
// Block virtualiser
const blk_virt = sddf_dep.artifact("blk_virt.elf");
b.installArtifact(blk_virt);

Expand Down

0 comments on commit 10d814d

Please sign in to comment.