From 897c4e5145474d55b247a4a3b5e6bf5420279e2f Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 24 Mar 2023 20:31:53 +0300 Subject: Kernel/x86: Bake the Prekernel and the Kernel into one image The new baked image is a Prekernel and a Kernel baked together now, so essentially we no longer need to pass the Prekernel as -kernel and the actual kernel image as -initrd to QEMU, leaving the option to pass an actual initrd or initramfs module later on with multiboot. --- Kernel/Arch/x86_64/linker.ld | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Kernel/Arch/x86_64') diff --git a/Kernel/Arch/x86_64/linker.ld b/Kernel/Arch/x86_64/linker.ld index e11648fe13..e9b7a870f1 100644 --- a/Kernel/Arch/x86_64/linker.ld +++ b/Kernel/Arch/x86_64/linker.ld @@ -69,6 +69,8 @@ SECTIONS start_of_kernel_data = .; *(.data*) end_of_kernel_data = .; + . = ALIGN(4K); + *(.heap) } :data .ro_after_init ALIGN(4K) : AT(ADDR(.ro_after_init)) @@ -85,9 +87,6 @@ SECTIONS *(COMMON) *(.bss*) end_of_kernel_bss = .; - - . = ALIGN(4K); - *(.heap) } :bss .dynamic ALIGN(4K) : AT (ADDR(.dynamic)) -- cgit v1.2.3