Index: kernel/arch/riscv64/_link.ld.in
===================================================================
--- kernel/arch/riscv64/_link.ld.in	(revision e3444229c8e3295e9e2bed75246c19263f3c51a6)
+++ kernel/arch/riscv64/_link.ld.in	(revision 2cea4c585d04ba6729a55fa46ff3c45fdd514a70)
@@ -14,4 +14,6 @@
 
 SECTIONS {
+	kernel_load_address = PA2KA(BOOT_OFFSET);
+
 	.image (PA2KA(BOOT_OFFSET)) : AT (0) {
 		ktext_start = .;
@@ -23,10 +25,4 @@
 		*(.data);                       /* initialized data */
 		*(.rodata*);
-		hardcoded_load_address = .;
-		QUAD(PA2KA(BOOT_OFFSET));
-		hardcoded_ktext_size = .;
-		QUAD(ktext_end - ktext_start);
-		hardcoded_kdata_size = .;
-		QUAD(kdata_end - kdata_start);
 		*(.sdata);
 		*(.reginfo);
