Changeset d639eaa in mainline

Timestamp:

2017-08-21T18:55:33Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0a78e4f

Parents:

7850dda

Message:

riscv64: update linker script, kernel functionality up to scheduling

Location:

kernel/arch/riscv64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (2 diffs)

kernel/arch/riscv64/Makefile.inc

@@ -31 +31 @@
 BFD = binary
 
+GCC_CFLAGS += -mcmodel=medany
+
 BITS = 64
 ENDIANESS = LE
 
 ARCH_SOURCES = \
+        arch/$(KARCH)/src/boot/boot.S \
         arch/$(KARCH)/src/asm.S \
+        arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/debug/stacktrace.c \
+        arch/$(KARCH)/src/drivers/ucb.c \
         arch/$(KARCH)/src/proc/scheduler.c \
         arch/$(KARCH)/src/proc/task.c \

kernel/arch/riscv64/_link.ld.in

@@ -14 +14 @@
 
 SECTIONS {
-        .unmapped BOOT_OFFSET: AT (0) {
-                unmapped_ktext_start = .;
+        .image (PA2KA(BOOT_OFFSET)) : AT (0) {
+                ktext_start = .;
                 *(K_TEXT_START);
-                unmapped_ktext_end = .;
-                
-                unmapped_kdata_start = .;
-                *(K_DATA_START);
-                *(K_INI_PTLS);
-                unmapped_kdata_end = .;
-        }
-        
-        .mapped (BOOT_OFFSET + SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) {
-                ktext_start = .;
                 *(.text);
                 ktext_end = .;
@@ -36 +26 @@
                 QUAD(PA2KA(BOOT_OFFSET));
                 hardcoded_ktext_size = .;
-                QUAD(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
+                QUAD(ktext_end - ktext_start);
                 hardcoded_kdata_size = .;
-                QUAD(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
-                hardcoded_unmapped_ktext_size = .;
-                QUAD(unmapped_ktext_end - unmapped_ktext_start);
-                hardcoded_unmapped_kdata_size = .;
-                QUAD(unmapped_kdata_end - unmapped_kdata_start);
+                QUAD(kdata_end - kdata_start);
                 *(.sdata);
                 *(.reginfo);