diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-31 11:00:59 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-31 11:00:59 +0200 |
| commit | aa595fad9c8062910778bd6fa01ee487eab1a3e9 (patch) | |
| tree | 2faa45d3984d15b2742a3657af6ab31f25bcfab3 /dev/boot/amd64-desktop.make | |
| parent | b91ada1d1fec572ee5d7ae9b98ff54ac929c7a72 (diff) | |
boot: fix framebuffer init and restore boot on real hardware
Framebuffer mode selection now defaults gracefully when the expected resolution is unavailable.
EFI binaries now boot successfully on physical hardware using a fixed image base and simplified jump logic.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/boot/amd64-desktop.make')
| -rw-r--r-- | dev/boot/amd64-desktop.make | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make index 6a8cb3f9..6e92330e 100644 --- a/dev/boot/amd64-desktop.make +++ b/dev/boot/amd64-desktop.make @@ -28,7 +28,7 @@ BIOS=OVMF.fd IMG=epm-master-1.img IMG_2=epm-master-2.img -BOOT=./src/neos_esp.img +BOOT=./src/nekernel-esp.img DISK_DRV = @@ -69,12 +69,12 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__BOOTZ__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \ - -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_APIS__ -DZBA_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT + -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_APIS__ -DZBA_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT -Wl,--disable-reloc-section -BOOTLOADER=bootz.exe -KERNEL=vkrnl.exe -SYSCHK=chk.sys -NETBOOT=net.sys +BOOTLOADER=bootz.efi +KERNEL=vmkrnl.efi +SYSCHK=chk.efi +BOOTNET=net.efi SCIKIT=libuser.dylib .PHONY: invalid-recipe @@ -90,7 +90,7 @@ all: compile-amd64 $(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/BOOTZ.EFI $(COPY) ../kernel/$(KERNEL) src/Root/$(KERNEL) $(COPY) ./modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK) - $(COPY) ./modules/BootNet/$(NETBOOT) src/Root/$(NETBOOT) + $(COPY) ./modules/BootNet/$(BOOTNET) src/Root/$(BOOTNET) $(COPY) ../user/$(SCIKIT) src/Root/$(SCIKIT) $(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER) @@ -138,7 +138,7 @@ efi: $(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd BINS=*.bin -EXECUTABLES=bootz.exe vkrnl.exe OVMF.fd +EXECUTABLES=bootz.efi vmkrnl.efi OVMF.fd TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES) |