summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoursoir <chat@joursoir.net>2022-09-27 18:59:00 +0300
committerJoursoir <chat@joursoir.net>2022-10-04 02:34:12 +0300
commit14c0596d40f5b02153ce379ea6060bd82120f4f9 (patch)
tree58d633b4aa883c7e9a52cbdf6431263a77458eeb
parent3955de98fa26ca847041f5fcb50268927b44a208 (diff)
downloadmfsos-14c0596d40f5b02153ce379ea6060bd82120f4f9.tar.gz
mfsos-14c0596d40f5b02153ce379ea6060bd82120f4f9.tar.bz2
mfsos-14c0596d40f5b02153ce379ea6060bd82120f4f9.zip
move our bootloader to special directory
-rw-r--r--Makefile2
-rw-r--r--arch/x86/boot/bootloader/Makefile (renamed from arch/x86/boot/Makefile)0
-rw-r--r--arch/x86/boot/bootloader/bios.inc (renamed from arch/x86/boot/bios.inc)0
-rw-r--r--arch/x86/boot/bootloader/bootsect.s (renamed from arch/x86/boot/bootsect.s)0
-rw-r--r--arch/x86/boot/bootloader/head.s (renamed from arch/x86/boot/head.s)0
-rw-r--r--arch/x86/boot/bootloader/linker.ld (renamed from arch/x86/boot/linker.ld)0
-rw-r--r--arch/x86/boot/bootloader/rm_seg.inc (renamed from arch/x86/boot/rm_seg.inc)0
-rw-r--r--arch/x86/boot/bootloader/setup.s (renamed from arch/x86/boot/setup.s)0
8 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e7c5182..caf5939 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ OSBIN = $(OSNAME).bin
KERNBIN = kernel.bin
ARCH = x86
-ARCH_BOOT = arch/$(ARCH)/boot
+ARCH_BOOT = arch/$(ARCH)/boot/bootloader
BOOTBIN = $(ARCH_BOOT)/bootloader.bin
TARGET = i686-elf
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/bootloader/Makefile
index e026e24..e026e24 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/bootloader/Makefile
diff --git a/arch/x86/boot/bios.inc b/arch/x86/boot/bootloader/bios.inc
index 19cd9a0..19cd9a0 100644
--- a/arch/x86/boot/bios.inc
+++ b/arch/x86/boot/bootloader/bios.inc
diff --git a/arch/x86/boot/bootsect.s b/arch/x86/boot/bootloader/bootsect.s
index a6e274e..a6e274e 100644
--- a/arch/x86/boot/bootsect.s
+++ b/arch/x86/boot/bootloader/bootsect.s
diff --git a/arch/x86/boot/head.s b/arch/x86/boot/bootloader/head.s
index d24e36c..d24e36c 100644
--- a/arch/x86/boot/head.s
+++ b/arch/x86/boot/bootloader/head.s
diff --git a/arch/x86/boot/linker.ld b/arch/x86/boot/bootloader/linker.ld
index 5e8dfd6..5e8dfd6 100644
--- a/arch/x86/boot/linker.ld
+++ b/arch/x86/boot/bootloader/linker.ld
diff --git a/arch/x86/boot/rm_seg.inc b/arch/x86/boot/bootloader/rm_seg.inc
index f6d4750..f6d4750 100644
--- a/arch/x86/boot/rm_seg.inc
+++ b/arch/x86/boot/bootloader/rm_seg.inc
diff --git a/arch/x86/boot/setup.s b/arch/x86/boot/bootloader/setup.s
index 2afc974..2afc974 100644
--- a/arch/x86/boot/setup.s
+++ b/arch/x86/boot/bootloader/setup.s