From 9230491801426030c78511d7c5bd75bfb18b7266 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 19 Mar 2023 22:19:40 +0200 Subject: [PATCH] Change BOOTLOADER options --- Makefile | 6 ++---- Makefile.conf | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ba8a0c28..4dbd4d84 100644 --- a/Makefile +++ b/Makefile @@ -133,8 +133,7 @@ ifeq ($(BOOTLOADER), lynx) -efi-boot-part --efi-boot-image --protective-msdos-label \ iso_tmp_data -o $(OSNAME).iso endif -ifeq ($(BOOTLOADER), other) -ifeq ($(OSARCH), amd64) +ifeq ($(BOOTLOADER), limine) cp tools/limine.cfg $(LIMINE_FOLDER)/limine.sys $(LIMINE_FOLDER)/limine-cd.bin $(LIMINE_FOLDER)/limine-cd-efi.bin iso_tmp_data/ xorriso -as mkisofs -quiet -b limine-cd.bin \ -no-emul-boot -boot-load-size 4 -boot-info-table \ @@ -142,7 +141,7 @@ ifeq ($(OSARCH), amd64) -efi-boot-part --efi-boot-image --protective-msdos-label \ iso_tmp_data -o $(OSNAME).iso endif -ifeq ($(OSARCH), i686) +ifeq ($(BOOTLOADER), grub) # TODO: Add custom language support for GRUB or detect the system language using "echo $LANG | cut -d . -f 1" and set "lang" variable inside grub.cfg mkdir -p iso_tmp_data/boot mkdir -p iso_tmp_data/boot/grub @@ -152,7 +151,6 @@ endif ifeq ($(OSARCH), aarch64) $(COMPILER_PATH)/$(COMPILER_ARCH)objcopy Kernel/kernel.fsys -O binary $(OSNAME).img endif -endif ifeq ($(OSARCH), amd64) QEMU_UEFI_BIOS = -bios /usr/share/qemu/OVMF.fd diff --git a/Makefile.conf b/Makefile.conf index 8a8196db..8466659c 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -15,9 +15,10 @@ KERNEL_VERSION = pre-alpha-0.0.0.1 # Which bootloader to use. # Available bootloaders: -# - lynx - Lynx Bootloader (still under development) -# - other - Limine (64-bit) & GRUB Bootloader (32-bit) -BOOTLOADER=other +# - lynx - Lynx (still under development) +# - limine - Limine +# - grub - GRUB +BOOTLOADER=limine # The path of the cross-compiler. COMPILER_PATH = tools/cross/bin