X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/47c4e0c19ae8526b14ce4e0d7b243f7a4dc6fafd..bffa3430fbbaaad29bec0b5bee9c1f0bfc7fd068:/lunaix-os/arch/x86/includes/linking/boot_secs.ldx?ds=sidebyside diff --git a/lunaix-os/arch/x86/includes/linking/boot_secs.ldx b/lunaix-os/arch/x86/includes/linking/boot_secs.ldx index 3c71be1..d918c84 100644 --- a/lunaix-os/arch/x86/includes/linking/boot_secs.ldx +++ b/lunaix-os/arch/x86/includes/linking/boot_secs.ldx @@ -3,27 +3,23 @@ #include "base_defs.ld.inc" -__kboot_start = .; - -.boot.text BLOCK(PAGE_GRAN) : +.boot.text BLOCK(PAGE_GRAN) : { #if defined(CONFIG_X86_BL_MB) || defined(CONFIG_X86_BL_MB2) *(.multiboot) #endif *(.boot.text) -} - -.boot.bss BLOCK(PAGE_GRAN) : -{ - *(.boot.bss) -} +} : boot_text -.boot.data BLOCK(PAGE_GRAN) : +.boot.data BLOCK(PAGE_GRAN) : { + /* + We treat our boot.bss as data. + to avoid confusing linker and some bootloader + */ *(.boot.data) -} - -__kboot_end = ALIGN(PAGE_GRAN); + *(.boot.bss) +} : boot_data #endif /* __LUNAIX_BOOT_SECS_LD_INC */