* Make the ksym table built-in with kernel image, thus remove the need

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

diff --git a/lunaix-os/link/linker.ld b/lunaix-os/link/linker.ld
index 71bc1511ff31a2cca0d01055cf866ab693aa218d..c3d57dac72cf24b6fdbd9fa7e1f2b8b134be8d3c 100644 (file)
--- a/lunaix-os/link/linker.ld
+++ b/lunaix-os/link/linker.ld
@@ -1,60 +1,77 @@
 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;

+    __kboot_start = .;

 
     /* 这里是我们的高半核初始化代码段和数据段 */
 
     /* 这里是我们的高半核初始化代码段和数据段 */

-    .boot.text BLOCK(4K) : {
+    .boot.text BLOCK(4K) : 
+    {

         *(.multiboot)
         *(.boot.text)
     }
 
         *(.multiboot)
         *(.boot.text)
     }
 

-    .boot.bss BLOCK(4K) : {
+    .boot.bss BLOCK(4K) : 
+    {

         *(.boot.bss)
     }
 
         *(.boot.bss)
     }
 

-    .boot.data BLOCK(4K) : {
+    .boot.data BLOCK(4K) : 
+    {

         *(.boot.data)
     }
 
         *(.boot.data)
     }
 

-    .boot.rodata BLOCK(4K) : {
+    .boot.rodata BLOCK(4K) : 
+    {

         *(.boot.rodata)
     }
 
         *(.boot.rodata)
     }
 

-    .boot.bss BLOCK(4K) : {
+    .boot.bss BLOCK(4K) : 
+    {

         *(.boot.rodata)
     }
         *(.boot.rodata)
     }

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

 
 

-    /* Relocation of our higher half kernel */

     . += 0xC0000000;
 
     /* 好了，我们的内核…… */
     . += 0xC0000000;
 
     /* 好了，我们的内核…… */

-    .text BLOCK(4K) : AT ( ADDR(.text) - 0xC0000000 ) {
+    
+    PROVIDE(__kexec_text_start = ALIGN(4K));
+    
+    .text BLOCK(4K) : AT ( ADDR(.text) - 0xC0000000 ) 
+    {

         __kexec_start = .;
         __kexec_start = .;

-        PROVIDE(__kexec_text_start = .);

         
         *(.text)
         
         *(.text)

+    }

 
 

-        PROVIDE(__kexec_text_end = .);
+    .kf.preempt BLOCK(4K) : AT ( ADDR(.kf.preempt) - 0xC0000000 ) 
+    {
+        PROVIDE(__kf_preempt_start = .);
+        
+        KEEP(*(.kf.preempt));
+
+        PROVIDE(__kf_preempt_end = .);

     }
 
     }
 

-    .data BLOCK(4K) : AT ( ADDR(.data) - 0xC0000000 ) {
+    PROVIDE(__kexec_text_end = .);
+
+    .data BLOCK(4K) : AT ( ADDR(.data) - 0xC0000000 ) 
+    {

         *(.data)
     }
 
         *(.data)
     }
 

-    .rodata BLOCK(4K) : AT ( ADDR(.rodata) - 0xC0000000 ) {
+    .rodata BLOCK(4K) : AT ( ADDR(.rodata) - 0xC0000000 ) 
+    {

         *(.rodata)
     }
 
         *(.rodata)
     }
 

-    .kpg BLOCK(4K) : AT ( ADDR(.kpg) - 0xC0000000 ) {
+    .kpg BLOCK(4K) : AT ( ADDR(.kpg) - 0xC0000000 ) 
+    {

         *(.kpg)
     }
 
         *(.kpg)
     }
 


@@ -62,7 +79,8 @@ SECTIONS {
 
     /* for generated array, we align to address line size */
 
 
     /* for generated array, we align to address line size */
 

-    .lga BLOCK(4K) : AT ( ADDR(.lga) - 0xC0000000 ) {
+    .lga BLOCK(4K) : AT ( ADDR(.lga) - 0xC0000000 ) 
+    {

         PROVIDE(__lga_twiplugin_inits_start = .);
         
         KEEP(*(.lga.twiplugin_inits));
         PROVIDE(__lga_twiplugin_inits_start = .);
         
         KEEP(*(.lga.twiplugin_inits));


@@ -71,16 +89,115 @@ SECTIONS {
 
         /* ---- */
 
 
         /* ---- */
 

-        PROVIDE(__lga_pci_dev_drivers_start = .);
+        /* align to 8 bytes, so it can cover both 32 and 64 bits address line*/
+        . = ALIGN(8);
+
+        PROVIDE(__lga_devdefs_start = .);
+        
+        KEEP(*(.lga.devdefs));
+
+        PROVIDE(__lga_devdefs_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_kboot_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_kboot));
+
+        PROVIDE(__lga_dev_ld_kboot_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_sysconf_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_sysconf));
+
+        PROVIDE(__lga_dev_ld_sysconf_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_timedev_start = .);
+        
+        KEEP(*(.lga.devdefs.ld_timedev));
+
+        PROVIDE(__lga_dev_ld_timedev_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_dev_ld_post_start = .);

         
         

-        KEEP(*(.lga.pci_dev_drivers));
+        KEEP(*(.lga.devdefs.ld_post));

 
 

-        PROVIDE(__lga_pci_dev_drivers_end = .);
+        PROVIDE(__lga_dev_ld_post_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_fs_start = .);
+        
+        KEEP(*(.lga.fs));
+
+        PROVIDE(__lga_fs_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_lunainit_on_earlyboot_start = .);
+        
+        KEEP(*(.lga.lunainit.c_earlyboot));
+
+        PROVIDE(__lga_lunainit_on_earlyboot_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_lunainit_on_boot_start = .);
+        
+        KEEP(*(.lga.lunainit.c_boot));
+
+        PROVIDE(__lga_lunainit_on_boot_end = .);
+
+        /* ---- */
+
+        . = ALIGN(8);
+
+        PROVIDE(__lga_lunainit_on_postboot_start = .);
+        
+        KEEP(*(.lga.lunainit.c_postboot));
+
+        PROVIDE(__lga_lunainit_on_postboot_end = .);
+
+    }
+
+    .ksymtable BLOCK(4K) : AT ( ADDR(.ksymtable) - 0xC0000000 )
+    {
+        *(.ksymtable)

     }
 
     }
 

-    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) {
+    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) 
+    {

         *(.bss)
     }
 
         *(.bss)
     }
 

+    .bss.kstack BLOCK(4K) : AT ( ADDR(.bss.kstack) - 0xC0000000)
+    {
+        PROVIDE(__bsskstack_start = .);
+
+        *(.bss.kstack)
+
+        PROVIDE(__bsskstack_end = .);
+    }
+

     __kexec_end = ALIGN(4K);
 }
\ No newline at end of file
     __kexec_end = ALIGN(4K);
 }
\ No newline at end of file