diff options
| author | Danny Holman <dholman@gymli.org> | 2025-08-28 08:36:42 -0500 |
|---|---|---|
| committer | Danny Holman <dholman@gymli.org> | 2025-08-28 08:36:42 -0500 |
| commit | a3085f5b9309c659c58282b4e50d955dcb0c0b7f (patch) | |
| tree | 0b41f921d7d4e40b96392149be291542648e1f68 /bootstrap/stage1/arch | |
| parent | bootstrap: create build files (diff) | |
| download | box-master.tar.gz box-master.tar.zst box-master.zip | |
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>
Diffstat (limited to 'bootstrap/stage1/arch')
| -rw-r--r-- | bootstrap/stage1/arch/x86_64/efi/entry.s | 25 | ||||
| -rw-r--r-- | bootstrap/stage1/arch/x86_64/efi/make.config | 5 | ||||
| -rw-r--r-- | bootstrap/stage1/arch/x86_64/make.conf | 27 |
3 files changed, 27 insertions, 30 deletions
diff --git a/bootstrap/stage1/arch/x86_64/efi/entry.s b/bootstrap/stage1/arch/x86_64/efi/entry.s deleted file mode 100644 index 411a9b2..0000000 --- a/bootstrap/stage1/arch/x86_64/efi/entry.s +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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/>. - */ - -.section .text - -.global _uefi_start -_uefi_start: - call efi_main - ret diff --git a/bootstrap/stage1/arch/x86_64/efi/make.config b/bootstrap/stage1/arch/x86_64/efi/make.config deleted file mode 100644 index eea15d2..0000000 --- a/bootstrap/stage1/arch/x86_64/efi/make.config +++ /dev/null @@ -1,5 +0,0 @@ -STAGE1_ARCH_INCLUDE=-I$(ARCHDIR)/include -STAGE1_ARCH_CFLAGS=-target x86_64-pc-win32-coff -STAGE1_ARCH_LDFLAGS= - -STAGE1_ARCH_OBJS=$(ARCHDIR)/entry.o \ diff --git a/bootstrap/stage1/arch/x86_64/make.conf b/bootstrap/stage1/arch/x86_64/make.conf new file mode 100644 index 0000000..ec364c7 --- /dev/null +++ b/bootstrap/stage1/arch/x86_64/make.conf @@ -0,0 +1,27 @@ +# 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/>. + +INCLUDE+=-I$(ARCHDIR)/include +AFLAGS+=-target $(ARCH)-pc-win32-coff +CFLAGS+=-mno-red-zone -mno-mmx -mno-sse -mno-sse2 -target $(ARCH)-pc-win32-coff +LDFLAGS+=-entry:_start + +ARCH_OBJS=$(ARCHDIR)/asm/entry.o \ + $(ARCHDIR)/asm/__chkstk.o \ + $(ARCHDIR)/asm/paging.o \ + $(ARCHDIR)/paging.o \ + $(ARCHDIR)/serial.o \ |