+bootloader

Author: EnderIce2

.github/workflows/makefile.yml

@@ -25,7 +25,14 @@ jobs:
         path: tools/cross
         key: ${{ runner.os }}-cross-${{ hashFiles('tools/Makefile') }}
 
-    - name: Install GNU Binutils & GNU Compiler Collection Dependencies
+    - name: Cache gnu-efi Folder
+      id: cache-gnuefi
+      uses: actions/cache@v3
+      with:
+        path: boot/UEFI/gnu-efi
+        key: ${{ runner.os }}-gnuefi-${{ hashFiles('boot/Makefile') }}
+
+    - name: Install GNU Binutils & GNU Compiler Collection
       if: steps.cache-cross.outputs.cache-hit != 'true'
       run: sudo apt-get install build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo -y
 
@@ -43,9 +50,28 @@ jobs:
       if: steps.cache-cross.outputs.cache-hit != 'true'
       run: make tools_workflow3
 
-    - name: Build Image
-      run: make build
-      
+    - name: Install MinGW compiler
+      run: sudo apt-get install make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y
+
+    - name: Get GNU-EFI source code and compile it
+      if: steps.cache-gnuefi.outputs.cache-hit != 'true'
+      run: make tools_workflow4
+
+    - name: Build Bootloader
+      run: make build_bootloader
+
+    - name: Build Kernel
+      run: make build_kernel
+
+    - name: Build LibC
+      run: make build_libc
+
+    - name: Build User-Space Applications
+      run: make build_userspace
+
+    - name: Build ISO Image
+      run: make build_image
+
     - name: Upload Artifact
       uses: actions/upload-artifact@v3.0.0
       with:

.vscode/c_cpp_properties.json

@@ -5,7 +5,8 @@
             "includePath": [
                 "${workspaceFolder}/kernel/include",
                 "${workspaceFolder}/libc/include",
-                "${workspaceFolder}/include"
+                "${workspaceFolder}/include",
+                "${workspaceFolder}/boot/UEFI/gnu-efi/inc"
             ],
             "defines": [
                 "DEBUG",

Makefile

@@ -71,6 +71,7 @@ fonts:
 # install necessary packages, compile cross-compiler etc..
 tools: fonts
 	make --quiet -C tools all
+	make --quiet -C boot gnuefi
 
 tools_workflow0: fonts
 	make --quiet -C tools do_initrd
@@ -84,11 +85,19 @@ tools_workflow2:
 tools_workflow3:
 	make --quiet -C tools do_gcc
 
-build: build_kernel build_libc build_userspace build_image
+tools_workflow4:
+	make --quiet -C boot gnuefi
+
+build: build_bootloader build_kernel build_libc build_userspace build_image
 
 rebuild: clean build
 
 # quickly build the operating system (it won't create the ISO file and doxygen documentation)
+build_bootloader:
+ifeq ($(BOOTLOADER), lynx)
+	make --quiet -C boot build
+endif
+
 build_kernel:
 	make -j$(shell nproc) --quiet -C kernel build
 
@@ -99,18 +108,26 @@ build_libc:
 	make --quiet -C libc build
 
 build_image:
-	mkdir -p limine-bootloader
+	mkdir -p iso_tmp_data
 	tar cf initrd.tar.gz -C resources/initrd/ ./ --format=ustar
-	cp kernel/kernel.fsys limine.cfg initrd.tar.gz startup.nsh \
-		${LIMINE_FOLDER}/limine.sys \
-		${LIMINE_FOLDER}/limine-cd.bin \
-		${LIMINE_FOLDER}/limine-cd-efi.bin \
-		limine-bootloader/
+	cp kernel/kernel.fsys initrd.tar.gz startup.nsh \
+		iso_tmp_data/
+ifeq ($(BOOTLOADER), lynx)
+	cp lynx.cfg boot/BIOS/loader.bin boot/UEFI/efi-loader.bin iso_tmp_data/
+	xorriso -as mkisofs -b loader.bin \
+		-no-emul-boot -boot-load-size 4 -boot-info-table \
+		--efi-boot efi-loader.bin \
+		-efi-boot-part --efi-boot-image --protective-msdos-label \
+		iso_tmp_data -o $(OSNAME).iso
+endif
+ifeq ($(BOOTLOADER), limine)
+	cp limine.cfg ${LIMINE_FOLDER}/limine.sys ${LIMINE_FOLDER}/limine-cd.bin ${LIMINE_FOLDER}/limine-cd-efi.bin iso_tmp_data/
 	xorriso -as mkisofs -b limine-cd.bin \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
 		--efi-boot limine-cd-efi.bin \
 		-efi-boot-part --efi-boot-image --protective-msdos-label \
-		limine-bootloader -o $(OSNAME).iso
+		iso_tmp_data -o $(OSNAME).iso
+endif
 
 vscode_debug: build_kernel build_libc build_userspace build_image
 	rm -f serial.log
@@ -129,7 +146,10 @@ run: build qemu_vdisk qemu
 
 # clean
 clean:
-	rm -rf doxygen-doc limine-bootloader initrd.tar.gz *.iso
+	rm -rf doxygen-doc iso_tmp_data initrd.tar.gz *.iso
+ifeq ($(BOOTLOADER), lynx)
+	make --quiet -C boot clean
+endif
 	make --quiet -C tools clean
 	make --quiet -C kernel clean
 	make --quiet -C userspace clean

Makefile.conf

@@ -6,6 +6,12 @@ OSNAME = FennixProject
 # Kernel version.
 KERNEL_VERSION = alpha-0.0.1
 
+# Which bootloader to use.
+# Available bootloaders:
+#   - lynx     - Lynx Bootloader
+#   - limine   - Limine Bootloader
+BOOTLOADER=limine
+
 # The path of the cross compiler.
 # If you want to use your own cross compiler (which I don't recommend),
 # change it to the path of the compiler.

boot/BIOS/Makefile

@@ -0,0 +1,8 @@
+
+NASM = /usr/bin/nasm
+
+build:
+	$(NASM) boot.asm -f bin -o loader.bin
+
+clean:
+	rm -f loader.bin

boot/BIOS/boot.asm

@@ -0,0 +1,39 @@
+[ORG 0x7C00]
+[BITS 16]
+
+start:
+    jmp	0x0000:boot
+    nop
+
+times 8-($-$$) db 0
+    ;   Boot Information Table
+    bi_PrimaryVolumeDescriptor      dd 0 ; LBA of the Primary Volume Descriptor
+    bi_BootFileLocation             dd 0 ; LBA of the Boot File
+    bi_BootFileLength               dd 0 ; Length of the boot file in bytes
+    bi_Checksum                     dd 0 ; 32 bit checksum
+    bi_Reserved            times 40 db 0 ; Reserved 'for future standardization'
+times 90-($-$$) db 0
+
+boot:
+	cli
+	xor ax, ax
+    mov ds, ax
+    mov si, UnsupportedString
+    call Print
+    jmp $
+
+Print:
+NextChar:
+    mov al, [si]
+    inc si
+    mov ah, 0x0e
+    mov bh, 0x00
+    mov bl, 0x07
+    int 0x10
+    or al, al
+    jz Exit
+    jmp NextChar
+Exit:
+    ret
+
+UnsupportedString db "BIOS boot is not supported.",0 

boot/Makefile

@@ -0,0 +1,21 @@
+
+GNUEFI_RELEASE_VERSION=3.0.14
+
+NASM = /usr/bin/nasm
+
+gnuefi:
+	wget https://deac-ams.dl.sourceforge.net/project/gnu-efi/gnu-efi-$(GNUEFI_RELEASE_VERSION).tar.bz2
+	tar -xf gnu-efi-$(GNUEFI_RELEASE_VERSION).tar.bz2 -C UEFI
+	rm gnu-efi-$(GNUEFI_RELEASE_VERSION).tar.bz2
+	mv UEFI/gnu-efi-$(GNUEFI_RELEASE_VERSION) UEFI/gnu-efi
+	cp -a ./UEFI/gnu-efi/inc/. ./UEFI/include
+	make -C UEFI/gnu-efi
+
+build:
+	$(info Compiling UEFI bootloader...)
+	make -C BIOS build
+	make -C UEFI build
+
+clean:
+	make -C UEFI clean
+	make -C BIOS clean

boot/UEFI/Makefile

@@ -0,0 +1,28 @@
+
+NAME=efi-loader.bin
+CC = gcc
+LD = ld
+OBJCOPY=objcopy
+
+C_SOURCES = $(shell find ./src -type f -name '*.c')
+OBJ = $(C_SOURCES:.c=.o)
+
+build: $(NAME)
+
+$(NAME): BOOTX64
+	dd if=/dev/zero of=$(NAME) bs=512 count=93750
+	mformat -i $(NAME) ::
+	mmd -i $(NAME) ::/EFI
+	mmd -i $(NAME) ::/EFI/BOOT
+	mcopy -i $(NAME) BOOTX64.EFI ::/EFI/BOOT
+
+BOOTX64: $(OBJ)
+	$(LD) -shared -Bsymbolic -Lgnu-efi/x86_64/lib -Lgnu-efi/x86_64/gnuefi -Tgnu-efi/gnuefi/elf_x86_64_efi.lds gnu-efi/x86_64/gnuefi/crt0-efi-x86_64.o $(OBJ) -o tmp.so -lgnuefi -lefi
+	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym  -j .rel -j .rela -j .rel.* -j .rela.* -j .reloc --target efi-app-x86_64 --subsystem=10 tmp.so BOOTX64.EFI
+	rm tmp.so
+
+%.o: %.c
+	$(CC) -Ignu-efi/inc -Ignu-efi/inc/x86_64 -Ignu-efi/inc/protocol -fpic -ffreestanding -fno-stack-protector -fno-stack-check -fshort-wchar -mno-red-zone -maccumulate-outgoing-args -c $< -o $@
+
+clean:
+	rm -f $(NAME) $(OBJ) BOOTX64.EFI

boot/UEFI/src/lynx.c

@@ -0,0 +1,12 @@
+#include <efi.h>
+#include <efilib.h>
+
+EFI_STATUS EFIAPI efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
+{
+    InitializeLib(ImageHandle, SystemTable);
+    SystemTable->BootServices->SetWatchdogTimer(0, 0, 0, NULL);
+    Print(L"Lynx Bootloader © EnderIce2 2022\n");
+    while (1)
+        asm("hlt");
+    return EFI_SUCCESS;
+}

limine.cfg

@@ -6,7 +6,7 @@ INTERFACE_BRANDING=Fennix Project
 COMMENT=Boot Fennix Project using Stivale2 protocol (Default)
 RESOLUTION=1280x720
 PROTOCOL=stivale2
-KERNEL_CMDLINE=debug
+KERNEL_CMDLINE=debug no4gbcap
 KERNEL_PATH=boot:///kernel.fsys
 MODULE_PATH=boot:///initrd.tar.gz
 MODULE_STRING=ustar

lynx.cfg

@@ -0,0 +1,2 @@
+CMDLINE=debug
+INITRD=initrd.tar.gz