Index: kernel/arch/riscv64/Makefile.inc
===================================================================
--- kernel/arch/riscv64/Makefile.inc	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/riscv64/Makefile.inc	(revision bf05c7451aebfdd5f9d9f9cba5cc3d3190368378)
@@ -27,7 +27,4 @@
 #
 
-BFD_NAME = elf64-littleriscv
-BFD_ARCH = riscv
-BFD = binary
 
 COMMON_CFLAGS += -mcmodel=medany
Index: kernel/arch/riscv64/_link.ld.in
===================================================================
--- kernel/arch/riscv64/_link.ld.in	(revision 8a1afd26eb90be3d715d4ce522280cbbf475f0a9)
+++ kernel/arch/riscv64/_link.ld.in	(revision bf05c7451aebfdd5f9d9f9cba5cc3d3190368378)
@@ -16,5 +16,5 @@
 	kernel_load_address = PA2KA(BOOT_OFFSET);
 
-	.image (PA2KA(BOOT_OFFSET)) : AT (0) {
+	.image (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS) : AT (SIZEOF_HEADERS) {
 		ktext_start = .;
 		*(K_TEXT_START);