Changeset 8a1afd2 in mainline for kernel/generic

Timestamp:

2018-10-17T22:51:33Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1d18bbc0, d723a80

Parents:

7900e5d

Message:

Remove hardcoded data variables from kernel linker scripts

Location:

kernel/generic

Files:

• include/main/main.h (modified) (1 diff)
• src/main/main.c (modified) (1 diff)

kernel/generic/include/main/main.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-extern size_t hardcoded_kdata_size;
-extern size_t hardcoded_ktext_size;
-extern uintptr_t hardcoded_load_address;
+/* Address of the start of the kernel image. */
+extern uint8_t kernel_load_address[];
+/* Address of the end of kernel. */
+extern uint8_t kdata_end[];
+
 extern uintptr_t stack_safe;
 

kernel/generic/src/main/main.c

@@ -168 +168 @@
         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;