Changeset 95c675b in mainline for kernel/arch/riscv64/_link.ld.in

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• kernel/arch/riscv64/_link.ld.in (modified) (2 diffs)

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);