summaryrefslogtreecommitdiff
path: root/bootstrap/stage2/arch
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap/stage2/arch')
-rw-r--r--bootstrap/stage2/arch/x86_64/linker.ld2
-rw-r--r--bootstrap/stage2/arch/x86_64/make.conf17
2 files changed, 18 insertions, 1 deletions
diff --git a/bootstrap/stage2/arch/x86_64/linker.ld b/bootstrap/stage2/arch/x86_64/linker.ld
index 7bd0460..f5489e5 100644
--- a/bootstrap/stage2/arch/x86_64/linker.ld
+++ b/bootstrap/stage2/arch/x86_64/linker.ld
@@ -1,7 +1,7 @@
ENTRY(_start)
SECTIONS {
- . = 0x2000;
+ . = 0x100000;
__bstart = .;
.text : {
diff --git a/bootstrap/stage2/arch/x86_64/make.conf b/bootstrap/stage2/arch/x86_64/make.conf
index 930b95e..4e4ab6f 100644
--- a/bootstrap/stage2/arch/x86_64/make.conf
+++ b/bootstrap/stage2/arch/x86_64/make.conf
@@ -1,3 +1,20 @@
+# Copyright (C) 2025 Danny Holman <dholman@gymli.org>
+#
+# This file is part of BoxOS, a free and open-source Unix-like operating
+# system.
+#
+# BoxOS is free software; you can redistribute it and/or modify under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# BoxOS; if not, see <https://www.gnu.org/licenses/>.
+
AFLAGS+=-target $(ARCH)-none-elf
CFLAGS+=-target $(ARCH)-none-elf -mno-red-zone -mno-mmx -mno-sse -mno-sse2
LDFLAGS+=--script=$(ARCHDIR)/linker.ld