aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2023-11-21 06:23:21 -0500
committerIan Moffett <ian@osmora.org>2023-11-24 05:57:12 -0500
commitdd4bde72c33c39437c1759cb523a5988fec14972 (patch)
treee91513c93142a406264c97442a695b65aec15def
parente9fea66278e2c4de4cb4e7e4dce7c61bc0667f2a (diff)
build: Update 'vega' binaries to 'hyra'
Signed-off-by: Ian Moffett <ian@osmora.org>
-rw-r--r--Makefile.in14
-rw-r--r--conf/limine.cfg2
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index e1b3052..e57d3a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ override KERNEL_ASMOBJECTS = $(KERNEL_ASMFILES:.S=.S.o)
override KERNEL_HEADER_DEPS = $(KERNEL_CFILES:.c=.d)
.PHONY: all
-all: base/boot/vega-kernel
+all: base/boot/hyra-kernel
rm -f sys/include/machine
rm -rf iso_root
@@ -76,15 +76,15 @@ clean:
sys/include/machine/:
cd sys/include/; ln -sf arch/$(ARCH) machine
-base/boot/vega-kernel: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS)
+base/boot/hyra-kernel: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS)
rm -rf iso_root
mkdir -p base/boot/
- $(PROMPT) " LD " $(shell pwd)/base/boot/vega-kernel
- $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) -o base/boot/vega-kernel
- tools/ksyms sys/kern/ksyms.c base/boot/vega-kernel
+ $(PROMPT) " LD " $(shell pwd)/base/boot/hyra-kernel
+ $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) -o base/boot/hyra-kernel
+ tools/ksyms sys/kern/ksyms.c base/boot/hyra-kernel
# === Generating symbols ===
$(CC) -c $(KERNEL_CFLAGS) $(KERNEL_DEFINES) sys/kern/ksyms.c -o sys/kern/ksyms.o
- $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) -o base/boot/vega-kernel
+ $(LD) $(KERNEL_LDFLAGS) $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS) -o base/boot/hyra-kernel
cd base/; tar cvf ../initramfs.tar * &> /dev/null
$(PROMPT) " RAMFS " $(shell pwd)/initramfs.tar
# === Building ISO ===
@@ -93,7 +93,7 @@ base/boot/vega-kernel: $(KERNEL_OBJECTS) $(KERNEL_ASMOBJECTS)
cp stand/limine/BOOTX64.EFI iso_root/EFI/BOOT/
cp conf/limine.cfg stand/limine/limine-bios.sys \
stand/limine/limine-bios-cd.bin stand/limine/limine-uefi-cd.bin iso_root/
- cp base/boot/vega-kernel iso_root/boot/
+ cp base/boot/hyra-kernel iso_root/boot/
mv initramfs.tar iso_root/boot/
xorriso -as mkisofs -b limine-bios-cd.bin -no-emul-boot -boot-load-size 4\
-boot-info-table --efi-boot limine-uefi-cd.bin -efi-boot-part \
diff --git a/conf/limine.cfg b/conf/limine.cfg
index 1f59940..dd76f2d 100644
--- a/conf/limine.cfg
+++ b/conf/limine.cfg
@@ -3,5 +3,5 @@ TIMEOUT=0
:Hyra
PROTOCOL=limine
-KERNEL_PATH=boot:///boot/vega-kernel
+KERNEL_PATH=boot:///boot/hyra-kernel
EDITOR_ENABLED=no