From e154cbf9a2a9eedd4c122d6619f25d29e04610ef Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Wed, 1 Jan 2025 23:25:44 +0100 Subject: IMPL: Update to fixes to kernel and bootloader. Signed-off-by: Amlal El Mahrouss --- dev/Boot/src/HEL/AMD64/BootMain.cc | 8 ++++---- dev/Boot/src/HEL/ARM64/BootMain.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dev/Boot/src/HEL') diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc index b927b4f1..db370db1 100644 --- a/dev/Boot/src/HEL/AMD64/BootMain.cc +++ b/dev/Boot/src/HEL/AMD64/BootMain.cc @@ -206,7 +206,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, Boot::BFileReader reader_syschk(L"syschk.sys", image_handle); reader_syschk.ReadAll(0); - Boot::BThread* syschk_thread = nullptr; + Boot::BootThread* syschk_thread = nullptr; // ------------------------------------------ // // If we succeed in reading the blob, then execute it. @@ -214,7 +214,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, if (reader_syschk.Blob()) { - syschk_thread = new Boot::BThread(reader_syschk.Blob()); + syschk_thread = new Boot::BootThread(reader_syschk.Blob()); syschk_thread->SetName("BootZ: System Recovery Check"); } @@ -265,7 +265,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, reader_kernel.ReadAll(0); - Boot::BThread* kernel_thread = nullptr; + Boot::BootThread* kernel_thread = nullptr; // ------------------------------------------ // // If we succeed in reading the blob, then execute it. @@ -273,7 +273,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, if (reader_kernel.Blob()) { - kernel_thread = new Boot::BThread(reader_kernel.Blob()); + kernel_thread = new Boot::BootThread(reader_kernel.Blob()); kernel_thread->SetName("BootZ: ZkaOS Kernel."); handover_hdr->f_KernelImage = reader_kernel.Blob(); diff --git a/dev/Boot/src/HEL/ARM64/BootMain.cc b/dev/Boot/src/HEL/ARM64/BootMain.cc index 1cf72d4b..4d303c33 100644 --- a/dev/Boot/src/HEL/ARM64/BootMain.cc +++ b/dev/Boot/src/HEL/ARM64/BootMain.cc @@ -66,7 +66,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, if (reader_kernel.Blob()) { - auto kernel_thread = Boot::BThread(reader_kernel.Blob()); + auto kernel_thread = Boot::BootThread(reader_kernel.Blob()); if (kernel_thread.IsValid()) kernel_thread.Start(nullptr, YES); -- cgit v1.2.3