diff options
| author | Danny Holman <dholman@gymli.org> | 2025-10-19 21:20:37 -0500 |
|---|---|---|
| committer | Danny Holman <dholman@gymli.org> | 2025-10-19 21:20:37 -0500 |
| commit | ef4c73ac58f4aae29e47b680808570e2203b9713 (patch) | |
| tree | 8644bb01e53bb03d9ab8562cff0778fbabbedb40 /kernel/arch/x86_64/make.conf | |
| parent | bootstrap: stage2: create build files (diff) | |
| download | box-ef4c73ac58f4aae29e47b680808570e2203b9713.tar.gz box-ef4c73ac58f4aae29e47b680808570e2203b9713.tar.zst box-ef4c73ac58f4aae29e47b680808570e2203b9713.zip | |
build: align all build files
Align all the build makefiles so that the standard template is used
OS-wide. Remove all the dangling files leftover from
pre-standardization.
Signed-off-by: Danny Holman <dholman@gymli.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/arch/x86_64/make.conf (renamed from modules.conf) | 39 | ||||
| -rw-r--r-- | kernel/arch/x86_64/make.config | 14 |
2 files changed, 13 insertions, 40 deletions
diff --git a/modules.conf b/kernel/arch/x86_64/make.conf index d850fa0..b41be94 100644 --- a/modules.conf +++ b/kernel/arch/x86_64/make.conf @@ -15,29 +15,16 @@ # You should have received a copy of the GNU General Public License along with # BoxOS; if not, see <https://www.gnu.org/licenses/>. -############################## -# Kernel drivers and modules # -############################## - -# Kernel configuration -DEBUG = YES - -# File systems -FS_FAT = MOD -FS_UFS = MOD - -# Firmware -EFI = MOD - -# Bus -PCI = MOD -SATA = MOD -USB = MOD - -# Block - -# Network - -# Graphics - -# Input +INCLUDE+=-I$(ARCHDIR)/include +AFLAGS+=-target $(ARCH)-none-elf +CFLAGS+=-mno-red-zone -mno-mmx -mno-sse -mno-sse2 -target $(ARCH)-none-elf +LDFLAGS+=--script=$(ARCHDIR)/linker.ld + +ARCH_OBJS=$(ARCHDIR)/asm/boot.o \ + $(ARCHDIR)/asm/isr.o \ + $(ARCHDIR)/asm/paging.o \ + $(ARCHDIR)/asm/spinlock.o \ + $(ARCHDIR)/asm/stack_trace.o \ + $(ARCHDIR)/asm/switch_thread.o \ + $(ARCHDIR)/kernel/serial.o \ + $(ARCHDIR)/kernel/syscall.o \ diff --git a/kernel/arch/x86_64/make.config b/kernel/arch/x86_64/make.config deleted file mode 100644 index 2347ce2..0000000 --- a/kernel/arch/x86_64/make.config +++ /dev/null @@ -1,14 +0,0 @@ -KERNEL_ARCH_INCLUDE=-I$(ARCHDIR)/include -KERNEL_ARCH_CFLAGS=$(SYS_CFLAGS) -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -KERNEL_ARCH_LDFLAGS= -KERNEL_ARCH_LIBS= - -KERNEL_ARCH_OBJS=$(ARCHDIR)/asm/boot.o \ - $(ARCHDIR)/asm/isr.o \ - $(ARCHDIR)/asm/paging.o \ - $(ARCHDIR)/asm/spinlock.o \ - $(ARCHDIR)/asm/stack_trace.o \ - $(ARCHDIR)/asm/switch_thread.o \ - $(ARCHDIR)/kernel/serial.o \ - $(ARCHDIR)/kernel/syscall.o \ - $(ARCHDIR)/mem/gdt.o \ |