summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJoursoir <chat@joursoir.net>2022-09-28 19:55:00 +0300
committerJoursoir <chat@joursoir.net>2022-10-04 02:42:51 +0300
commit36501d7d38ca32031c8401fed67c4cb684a9f495 (patch)
tree23a1fbafb49bc42c482406b53bdeeabe9e0862b8 /arch
parent14c0596d40f5b02153ce379ea6060bd82120f4f9 (diff)
downloadmfsos-36501d7d38ca32031c8401fed67c4cb684a9f495.tar.gz
mfsos-36501d7d38ca32031c8401fed67c4cb684a9f495.tar.bz2
mfsos-36501d7d38ca32031c8401fed67c4cb684a9f495.zip
move multiboot files to special directory
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/multiboot/linker.ld51
-rw-r--r--arch/x86/boot/multiboot/multiboot.s (renamed from arch/x86/boot/multiboot.s)0
2 files changed, 51 insertions, 0 deletions
diff --git a/arch/x86/boot/multiboot/linker.ld b/arch/x86/boot/multiboot/linker.ld
new file mode 100644
index 0000000..245f4a7
--- /dev/null
+++ b/arch/x86/boot/multiboot/linker.ld
@@ -0,0 +1,51 @@
+/*
+The bootloader will look at this image and start execution at the
+symbol designated as the entry point.
+*/
+ENTRY(_start)
+
+/* Tell where the various sections of the object files will be put
+in the final kernel image. */
+SECTIONS
+{
+ /*
+ Begin putting sections at 1 MiB, a conventional place for kernels to be
+ loaded at by the bootloader.
+ */
+ . = 1M;
+
+ /*
+ First put the multiboot header, as it is required to be put very early
+ in the image or the bootloader won't recognize the file format.
+ Next we'll put the .text section.
+ */
+ .text BLOCK(4K) : ALIGN(4K)
+ {
+ *(.multiboot)
+ *(.text)
+ }
+
+ /* Read-only data. */
+ .rodata BLOCK(4K) : ALIGN(4K)
+ {
+ *(.rodata)
+ }
+
+ /* Read-write data (initialized) */
+ .data BLOCK(4K) : ALIGN(4K)
+ {
+ *(.data)
+ }
+
+ /* Read-write data (uninitialized) and stack */
+ .bss BLOCK(4K) : ALIGN(4K)
+ {
+ *(COMMON)
+ *(.bss)
+ }
+
+ /*
+ The compiler may produce other sections, by default it will put them in
+ a segment with the same name. Simply add stuff here as needed.
+ */
+}
diff --git a/arch/x86/boot/multiboot.s b/arch/x86/boot/multiboot/multiboot.s
index 33e54f1..33e54f1 100644
--- a/arch/x86/boot/multiboot.s
+++ b/arch/x86/boot/multiboot/multiboot.s