diff --git a/src/kernel/boot/loader/loader.cpp b/src/kernel/boot/loader/loader.cpp index de950b7efb..bac3f58855 100644 --- a/src/kernel/boot/loader/loader.cpp +++ b/src/kernel/boot/loader/loader.cpp @@ -56,8 +56,7 @@ load_kernel(stage2_args *args, Directory *volume) puts("load kernel..."); - preloaded_image image; - status_t status = elf_load_image(fd, &image); + status_t status = elf_load_image(fd, &gKernelArgs.kernel_image); close(fd); @@ -68,14 +67,8 @@ load_kernel(stage2_args *args, Directory *volume) puts("kernel loaded successfully"); - // init kernel args with loaded image data - gKernelArgs.kernel_seg0_addr.start = image.text_region.start; - gKernelArgs.kernel_seg0_addr.size = image.text_region.size; - gKernelArgs.kernel_seg1_addr.start = image.data_region.start; - gKernelArgs.kernel_seg1_addr.size = image.data_region.size; - gKernelArgs.kernel_dynamic_section_addr = image.dynamic_section; - - gKernelEntry = image.elf_header.e_entry; + gKernelEntry = gKernelArgs.kernel_image.elf_header.e_entry; + // ToDo: gKernelEntry is no longer needed return B_OK; }