From d09a28856f22e146d7cc833a35c0347bd0942e6b Mon Sep 17 00:00:00 2001 From: Tidux Date: Sun, 20 Oct 2019 06:15:39 +0000 Subject: [PATCH] Kernel: Move Boot/ into Arch/i386/Boot (#667) --- Kernel/{ => Arch/i386}/Boot/boot.S | 0 Kernel/Makefile | 2 +- Kernel/linker.ld | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Kernel/{ => Arch/i386}/Boot/boot.S (100%) diff --git a/Kernel/Boot/boot.S b/Kernel/Arch/i386/Boot/boot.S similarity index 100% rename from Kernel/Boot/boot.S rename to Kernel/Arch/i386/Boot/boot.S diff --git a/Kernel/Makefile b/Kernel/Makefile index 5331917a77..941aee8896 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -105,7 +105,7 @@ AK_OBJS = \ ../AK/ELF/ELFLoader.o CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS) -OBJS = $(CXX_OBJS) Boot/boot.ao +OBJS = $(CXX_OBJS) Arch/i386/Boot/boot.ao KERNEL = kernel CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2 diff --git a/Kernel/linker.ld b/Kernel/linker.ld index ef808a575c..e0880fd96e 100644 --- a/Kernel/linker.ld +++ b/Kernel/linker.ld @@ -6,7 +6,7 @@ SECTIONS .text BLOCK(4K) : ALIGN(4K) { - Boot/boot.ao + Arch/i386/Boot/boot.ao *(.multiboot) *(.text) }