From 86b12d85c703e75ef9bfa064d0fcdba5d5e1c9a7 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Mon, 11 Jun 2018 15:12:52 +1200 Subject: [PATCH] efi: move various init before call to main(). * With the previous commit, we can now move functions that require calling mmu_map_physical_memory to where they should have been originally. This also allows the SMP safe mode menu entries to be properly generated, now that smp_init is called prior to main(). Change-Id: I05ddca5273b11cb4846021664c1ea2cf8ba723b7 --- src/system/boot/platform/efi/start.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/system/boot/platform/efi/start.cpp diff --git a/src/system/boot/platform/efi/start.cpp b/src/system/boot/platform/efi/start.cpp old mode 100644 new mode 100755 index a8cc4bc718..dcac306874 --- a/src/system/boot/platform/efi/start.cpp +++ b/src/system/boot/platform/efi/start.cpp @@ -147,10 +147,6 @@ platform_start_kernel(void) if (gKernelArgs.kernel_image->elf_class != ELFCLASS64) panic("32-bit kernels not supported with EFI"); - cpu_init(); - acpi_init(); - hpet_init(); - smp_init(); smp_init_other_cpus(); preloaded_elf64_image *image = static_cast( @@ -292,6 +288,11 @@ efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *systemTable) gKernelArgs.arch_args.hpet_phys = 0; gKernelArgs.arch_args.hpet = NULL; + cpu_init(); + acpi_init(); + hpet_init(); + smp_init(); + main(&args); return EFI_SUCCESS;