diff options
Diffstat (limited to 'Kernel')
| -rw-r--r-- | Kernel/Arch/aarch64/Dummy.cpp | 3 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/init.cpp | 12 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/linker.ld | 5 | ||||
| -rw-r--r-- | Kernel/CMakeLists.txt | 1 |
4 files changed, 3 insertions, 18 deletions
diff --git a/Kernel/Arch/aarch64/Dummy.cpp b/Kernel/Arch/aarch64/Dummy.cpp index 101adf32f1..feb3d84992 100644 --- a/Kernel/Arch/aarch64/Dummy.cpp +++ b/Kernel/Arch/aarch64/Dummy.cpp @@ -32,6 +32,9 @@ bool g_pci_access_is_disabled_from_commandline { true }; // x86 init +multiboot_module_entry_t multiboot_copy_boot_modules_array[16]; +size_t multiboot_copy_boot_modules_count; + extern "C" { READONLY_AFTER_INIT PhysicalAddress start_of_prekernel_image; READONLY_AFTER_INIT PhysicalAddress end_of_prekernel_image; diff --git a/Kernel/Arch/aarch64/init.cpp b/Kernel/Arch/aarch64/init.cpp index 326b32051e..b407c49ab8 100644 --- a/Kernel/Arch/aarch64/init.cpp +++ b/Kernel/Arch/aarch64/init.cpp @@ -45,12 +45,6 @@ uintptr_t __stack_chk_guard; READONLY_AFTER_INIT bool g_in_early_boot; -extern "C" const u32 disk_image_start; -extern "C" const u32 disk_image_size; - -multiboot_module_entry_t multiboot_copy_boot_modules_array[16]; -size_t multiboot_copy_boot_modules_count; - namespace Kernel { static void draw_logo(u8* framebuffer_data); @@ -119,12 +113,6 @@ extern "C" [[noreturn]] void init() multiboot_memory_map = mmap; multiboot_memory_map_count = 1; - multiboot_flags = 0x4; - multiboot_copy_boot_modules_count = 1; - auto disk_image_start_physical_addr = ((FlatPtr)&disk_image_start - kernel_load_base); - multiboot_copy_boot_modules_array[0].start = disk_image_start_physical_addr; - multiboot_copy_boot_modules_array[0].end = disk_image_start_physical_addr + disk_image_size; - dbgln("Welcome to Serenity OS!"); dbgln("Imagine this being your ideal operating system."); dbgln("Observed deviations from that ideal are shortcomings of your imagination."); diff --git a/Kernel/Arch/aarch64/linker.ld b/Kernel/Arch/aarch64/linker.ld index 6732893a09..e80bf29e5c 100644 --- a/Kernel/Arch/aarch64/linker.ld +++ b/Kernel/Arch/aarch64/linker.ld @@ -80,11 +80,6 @@ SECTIONS page_tables_phys_end = .; end_of_kernel_image = .; - - disk_image ALIGN(4K) : AT (ADDR(disk_image) - KERNEL_MAPPING_BASE) - { - *(disk_image) - } } size_of_bss_divided_by_8 = (end_of_bss - start_of_bss + 7) / 8; diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index fea4290cae..09316ae607 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -733,7 +733,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kernel.map" DESTINATION res) if ("${SERENITY_ARCH}" STREQUAL "aarch64") embed_resource(Kernel serenity_boot_logo "Arch/aarch64/SerenityLogoRGB.ppm") - embed_resource(Kernel disk_image "../Build/aarch64/_disk_image") add_custom_command( TARGET Kernel POST_BUILD COMMAND ${CMAKE_OBJCOPY} -O binary Kernel kernel8.img |