Index: boot/arch/riscv64/Makefile.inc
===================================================================
--- boot/arch/riscv64/Makefile.inc	(revision 8684e346eaa5bac88522301324eb2cebb94b52a0)
+++ boot/arch/riscv64/Makefile.inc	(revision 356e17e093ea30596640858cbf8afc9b7858be9a)
@@ -27,26 +27,4 @@
 #
 
-BFD_NAME = elf64-littleriscv
-BFD_OUTPUT = $(BFD_NAME)
-
-BITS = 64
-ENDIANESS = LE
-EXTRA_CFLAGS = -mcmodel=medany
-
-SOURCES = \
-	arch/$(BARCH)/src/asm.S \
-	arch/$(BARCH)/src/main.c \
-	arch/$(BARCH)/src/ucb.c \
-	arch/$(BARCH)/src/putchar.c \
-	$(COMPS).o \
-	generic/src/memstr.c \
-	generic/src/printf_core.c \
-	generic/src/vprintf.c \
-	generic/src/printf.c \
-	generic/src/str.c \
-	generic/src/version.c \
-	generic/src/inflate.c \
-	generic/src/gzip.c \
-	generic/src/tar.c \
-	generic/src/kernel.c \
-	generic/src/payload.c
+BUILD = Makefile.empty
+POSTBUILD = Makefile.empty
Index: boot/arch/riscv64/meson.build
===================================================================
--- boot/arch/riscv64/meson.build	(revision 356e17e093ea30596640858cbf8afc9b7858be9a)
+++ boot/arch/riscv64/meson.build	(revision 356e17e093ea30596640858cbf8afc9b7858be9a)
@@ -0,0 +1,22 @@
+BUILD = true
+POSTBUILD = 'raw'
+boot_image_format = 'elf'
+POST_OUTPUT = 'image.boot'
+
+boot_src = files(
+	'src/asm.S',
+	'src/main.c',
+	'src/ucb.c',
+	'src/putchar.c',
+	'../../generic/src/memstr.c',
+	'../../generic/src/printf_core.c',
+	'../../generic/src/vprintf.c',
+	'../../generic/src/printf.c',
+	'../../generic/src/str.c',
+	'../../generic/src/version.c',
+	'../../generic/src/inflate.c',
+	'../../generic/src/gzip.c',
+	'../../generic/src/tar.c',
+	'../../generic/src/kernel.c',
+	'../../generic/src/payload.c',
+)