diff options
| author | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-02-24 09:04:34 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-02-24 09:04:34 +0100 |
| commit | 917eae9453ecac6d9aeb04254d5d5c97e5a6c9e1 (patch) | |
| tree | 767f6aeabb24f02c119e073e3efd2c710aabed5d /Private/NewBoot/Source | |
| parent | 5563deabd8f7ce3fc713ea23f8cf5bbac33b4024 (diff) | |
Kernel: MS-1: Microkernel and bootloader.
Signed-off-by: Amlal El Mahrouss <amlalelmahrouss@icloud.com>
Diffstat (limited to 'Private/NewBoot/Source')
| -rw-r--r-- | Private/NewBoot/Source/BootMain.cxx | 6 | ||||
| -rw-r--r-- | Private/NewBoot/Source/bundle.mk | 2 | ||||
| -rw-r--r-- | Private/NewBoot/Source/standard.mk | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Private/NewBoot/Source/BootMain.cxx b/Private/NewBoot/Source/BootMain.cxx index 0db90e6f..ea83e1f4 100644 --- a/Private/NewBoot/Source/BootMain.cxx +++ b/Private/NewBoot/Source/BootMain.cxx @@ -11,6 +11,7 @@ #include <BootKit/BootKit.hxx> #include <EFIKit/Api.hxx> +#include <HALKit/AMD64/ACPI/ACPI.hpp> #include <KernelKit/MSDOS.hpp> #include <KernelKit/PE.hpp> #include <NewKit/Ref.hpp> @@ -144,10 +145,11 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle, handoverHdrPtr->f_FirmwareVendorLen); #ifdef __BUNDLE_KERNEL__ + handoverHdrPtr->f_LiteEdition = true; writer.WriteString(L"HCoreLite: Exit Boot...").WriteString(L"\r\n"); #else - writer.WriteString(L"HCoreLdr: Load File succeeded, running it...") - .WriteString(L"\r\n"); + handoverHdrPtr->f_LiteEdition = false; + writer.WriteString(L"HCoreLdr: Exit Boot...").WriteString(L"\r\n"); #endif EFI::ExitBootServices(MapKey, ImageHandle); diff --git a/Private/NewBoot/Source/bundle.mk b/Private/NewBoot/Source/bundle.mk index cf4ac376..3f1df9e0 100644 --- a/Private/NewBoot/Source/bundle.mk +++ b/Private/NewBoot/Source/bundle.mk @@ -22,7 +22,7 @@ bootloader-amd64: $(ASM) $(FLAG_ASM) HEl/AMD64/AMD64-VirtualMemory.asm $(LD_GNU) $(OBJ) $(LD_FLAGS) -o HCoreKrnl.exe cp HCoreKrnl.exe CDROM/EFI/BOOT/BOOTX64.EFI - cp HCoreKrnl.exe CDROM/HCOREKRNL.EXE + cp HCoreKrnl.exe CDROM/HCOREKRNL.DLL cp ../../Root/System/LookAndFeel.css CDROM/LOOK.CSS .PHONY: run-efi-amd64 diff --git a/Private/NewBoot/Source/standard.mk b/Private/NewBoot/Source/standard.mk index fab7453d..2ca70592 100644 --- a/Private/NewBoot/Source/standard.mk +++ b/Private/NewBoot/Source/standard.mk @@ -22,7 +22,6 @@ bootloader-amd64: $(ASM) $(FLAG_ASM) HEl/AMD64/AMD64-VirtualMemory.asm $(LD_GNU) $(OBJ) $(LD_FLAGS) -o HCoreLdr.exe cp HCoreLdr.exe CDROM/EFI/BOOT/BOOTX64.EFI - cp ../../HCoreKrnl.exe CDROM/HCOREKRNL.EXE && cp ../../Root/System/LookAndFeel.css CDROM/LOOK.CSS .PHONY: run-efi-amd64 run-efi-amd64: |