From a3085f5b9309c659c58282b4e50d955dcb0c0b7f Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.org>
Date: Thu, 28 Aug 2025 08:36:42 -0500
Subject: bootstrap: update build configs

Update the build configuration files for the included bootloader to
match the formatting requirements of the main build configs.

Signed-off-by: Danny Holman <dholman@gymli.org>
---
 bootstrap/stage2/arch/x86_64/linker.ld   | 2 +-
 bootstrap/stage2/arch/x86_64/make.conf   | 5 +++++
 bootstrap/stage2/arch/x86_64/make.config | 6 ------
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 bootstrap/stage2/arch/x86_64/make.conf
 delete mode 100644 bootstrap/stage2/arch/x86_64/make.config

(limited to 'bootstrap/stage2/arch')

diff --git a/bootstrap/stage2/arch/x86_64/linker.ld b/bootstrap/stage2/arch/x86_64/linker.ld
index 04b6148..7bd0460 100644
--- a/bootstrap/stage2/arch/x86_64/linker.ld
+++ b/bootstrap/stage2/arch/x86_64/linker.ld
@@ -1,4 +1,4 @@
-ENTRY(bootstrap_main)
+ENTRY(_start)
 
 SECTIONS {
         . = 0x2000;
diff --git a/bootstrap/stage2/arch/x86_64/make.conf b/bootstrap/stage2/arch/x86_64/make.conf
new file mode 100644
index 0000000..930b95e
--- /dev/null
+++ b/bootstrap/stage2/arch/x86_64/make.conf
@@ -0,0 +1,5 @@
+AFLAGS+=-target $(ARCH)-none-elf
+CFLAGS+=-target $(ARCH)-none-elf -mno-red-zone -mno-mmx -mno-sse -mno-sse2
+LDFLAGS+=--script=$(ARCHDIR)/linker.ld
+
+ARCH_OBJS=$(ARCHDIR)/asm/entry.o \
diff --git a/bootstrap/stage2/arch/x86_64/make.config b/bootstrap/stage2/arch/x86_64/make.config
deleted file mode 100644
index 3c73a35..0000000
--- a/bootstrap/stage2/arch/x86_64/make.config
+++ /dev/null
@@ -1,6 +0,0 @@
-STAGE2_ARCH_INCLUDE=-I$(ARCHDIR)/include
-STAGE2_ARCH_CFLAGS=-target x86_64-pc-none-elf -mno-red-zone -mno-mmx -mno-sse -mno-sse2
-STAGE2_ARCH_LDFLAGS=
-STAGE2_ARCH_LIBS=
-
-STAGE2_ARCH_OBJS=
-- 
cgit v1.2.3