Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
+++ kernel/generic/src/main/main.c	(revision 4db05eabc7fa0bd0ef4a266c375abc1210212cba)
@@ -168,7 +168,8 @@
 	config.cpu_active = 1;
 
-	config.base = hardcoded_load_address;
-	config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
-	    hardcoded_kdata_size, PAGE_SIZE);
+	config.base = (uintptr_t) kernel_load_address;
+
+	config.kernel_size =
+	    ALIGN_UP((uintptr_t) kdata_end - config.base, PAGE_SIZE);
 	config.stack_size = STACK_SIZE;