refactor: use a more decent physical memory map

[lunaix-os.git] / lunaix-os / link / linker.ld

diff --git a/lunaix-os/link/linker.ld b/lunaix-os/link/linker.ld
index ba3a3853a232d4fb4c9bd10df8a1175f660ff367..f2510aa5194872677889770b26b1fcbc5c0c551c 100644 (file)
--- a/lunaix-os/link/linker.ld
+++ b/lunaix-os/link/linker.ld
@@ -1,70 +1,95 @@
 ENTRY(start_)
 
 ENTRY(start_)
 

-/*
-    FUTURE: Use disk reader
-    A bit of messy here.
-    We will pull our higher half kernel out of this shit
-      and load it separately once we have our disk reader.
-*/
-

 SECTIONS {
     . = 0x100000;
 
     /* 这里是我们的高半核初始化代码段和数据段 */
 SECTIONS {
     . = 0x100000;
 
     /* 这里是我们的高半核初始化代码段和数据段 */

+    .boot.text BLOCK(4K) : {
+        *(.multiboot)
+        *(.boot.text)
+    }

 
 

-    .hhk_init_text BLOCK(4K) : {
-        * (.multiboot)
-        build/obj/arch/x86/*.o (.hhk_init)
-        build/obj/arch/x86/*.o (.text)
+    .boot.bss BLOCK(4K) : {
+        *(.boot.bss)

     }
 
     }
 

-    .hhk_init_bss BLOCK(4K) : {
-        build/obj/arch/x86/*.o (.bss)
+    .boot.data BLOCK(4K) : {
+        *(.boot.data)

     }
 
     }
 

-    .hhk_init_data BLOCK(4K) : {
-        build/obj/arch/x86/*.o (.data)
+    .boot.rodata BLOCK(4K) : {
+        *(.boot.rodata)

     }
 
     }
 

-    .hhk_init_rodata BLOCK(4K) : {
-        build/obj/arch/x86/*.o (.rodata)
+    .boot.bss BLOCK(4K) : {
+        *(.boot.rodata)

     }
     }

-    __init_hhk_end = ALIGN(4K);
+    __kexec_boot_end = ALIGN(4K);
+
+    /* ---- boot end ---- */
+
+    /* ---- kernel start ---- */

 
 

-    /* Relocation of our higher half kernel */

     . += 0xC0000000;
 
     /* 好了，我们的内核…… */
     .text BLOCK(4K) : AT ( ADDR(.text) - 0xC0000000 ) {
     . += 0xC0000000;
 
     /* 好了，我们的内核…… */
     .text BLOCK(4K) : AT ( ADDR(.text) - 0xC0000000 ) {

-        __kernel_start = .;
-        build/obj/kernel/*.o (.text)
-        build/obj/hal/*.o (.text)
+        __kexec_start = .;
+        PROVIDE(__kexec_text_start = .);
+        
+        *(.text)
+
+        PROVIDE(__kexec_text_end = .);

     }
 
     }
 

-    __usrtext_start = ALIGN(4K);
-    .usrtext BLOCK(4K) : AT ( ADDR(.usrtext) - 0xC0000000 ) {
-        build/obj/kernel/*.o (.usrtext)
+    .data BLOCK(4K) : AT ( ADDR(.data) - 0xC0000000 ) {
+        *(.data)

     }
     }

-    __usrtext_end = ALIGN(4K);

 
 

-    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) {
-        build/obj/kernel/*.o (.bss)
-        build/obj/hal/*.o (.bss)
+    .rodata BLOCK(4K) : AT ( ADDR(.rodata) - 0xC0000000 ) {
+        *(.rodata)

     }
 
     }
 

-    .data BLOCK(4k) : AT ( ADDR(.data) - 0xC0000000 ) {
-        build/obj/kernel/*.o (.data)
-        build/obj/hal/*.o (.data)
+    .kpg BLOCK(4K) : AT ( ADDR(.kpg) - 0xC0000000 ) {
+        *(.kpg)

     }
 
     }
 

-    .rodata BLOCK(4K) : AT ( ADDR(.rodata) - 0xC0000000 ) {
-        build/obj/kernel/*.o (.rodata)
-        build/obj/hal/*.o (.rodata)
+    . = ALIGN(4K);
+
+    /* for generated array, we align to address line size */
+
+    .lga BLOCK(4K) : AT ( ADDR(.lga) - 0xC0000000 ) {
+        PROVIDE(__lga_twiplugin_inits_start = .);
+        
+        KEEP(*(.lga.twiplugin_inits));
+
+        PROVIDE(__lga_twiplugin_inits_end = .);
+
+        /* ---- */
+
+        /* align to 8 bytes, so it can cover both 32 and 64 bits address line*/
+        . = ALIGN(8);
+
+        PROVIDE(__lga_pci_dev_drivers_start = .);
+        
+        KEEP(*(.lga.pci_dev_drivers));
+
+        PROVIDE(__lga_pci_dev_drivers_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_platdev_db_start = .);
+        
+        KEEP(*(.lga.platdev_db));
+
+        PROVIDE(__lga_platdev_db_end = .);

     }
 
     }
 

-    .kpg BLOCK(4K) : AT ( ADDR(.kpg) - 0xC0000000 ) {
-        build/obj/arch/x86/*.o (.kpg)
+    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) {
+        *(.bss)

     }
 
     }
 

-    __kernel_end = ALIGN(4K);
+    __kexec_end = ALIGN(4K);

 }
\ No newline at end of file
 }
\ No newline at end of file