From 8cb34498eceef231927c444507b6787128c5f0d8 Mon Sep 17 00:00:00 2001 From: Nathan Ringo Date: Sun, 1 Sep 2024 20:49:26 -0500 Subject: Move everything over to the new organization. --- boards/qemu-virt/default.nix | 11 ++++++----- boards/qemu-virt/qemu-virt.s | 21 --------------------- 2 files changed, 6 insertions(+), 26 deletions(-) (limited to 'boards/qemu-virt') diff --git a/boards/qemu-virt/default.nix b/boards/qemu-virt/default.nix index e41d924..d80d5d4 100644 --- a/boards/qemu-virt/default.nix +++ b/boards/qemu-virt/default.nix @@ -1,7 +1,8 @@ -{ mkKernel }: +{ + vernos-arch = "riscv64"; + vernos-board = "qemu-virt"; + src = ./.; -mkKernel { - name = "qemu-virt"; - asmFile = ./qemu-virt.s; - linkerScript = ./qemu-virt.ld; + ASFLAGS = "-march=rv64gc -mabi=lp64d"; + LDFLAGS = "--gc-sections"; } diff --git a/boards/qemu-virt/qemu-virt.s b/boards/qemu-virt/qemu-virt.s index c7e7642..0d69d4d 100644 --- a/boards/qemu-virt/qemu-virt.s +++ b/boards/qemu-virt/qemu-virt.s @@ -11,11 +11,6 @@ _start: csrr tp, mhartid bnez tp, wait_for_hart0 - ## Set up console_strict_flush. - la t0, console_strict_flush - la t1, CONSOLE_STRICT_FLUSH - sd t0, (t1) - ## Set up hart0's stack. la sp, hart0_initial_stack_top @@ -89,19 +84,3 @@ wait_for_hart0: wfi j wait_for_hart0 .size wait_for_hart0, . - wait_for_hart0 - -.section .text - -.type console_strict_flush, STT_FUNC -console_strict_flush: - li t0, 0x10000000 -1: - c.beqz a1, 2f - lb t1, (a0) - sb t1, (t0) - addi a0, a0, 1 - addi a1, a1, -1 - j 1b -2: - ret -.size console_strict_flush, . - console_strict_flush -- cgit v1.2.3