Kernel: Move all boot-related code to the new Boot subdirectory

Kernel/Arch/aarch64/MMU.cpp

@@ -13,7 +13,7 @@
 #include <Kernel/Arch/aarch64/RPi/MMIO.h>
 #include <Kernel/Arch/aarch64/RPi/UART.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 

Kernel/Arch/aarch64/RPi/Framebuffer.cpp

@@ -8,7 +8,7 @@
 #include <Kernel/Arch/aarch64/BootPPMParser.h>
 #include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
 #include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::RPi {

Kernel/Arch/init.cpp

@@ -7,12 +7,13 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/InterruptManagement.h>
 #include <Kernel/Arch/Processor.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
+#include <Kernel/Boot/CommandLine.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/Bus/USB/USBManagement.h>
 #include <Kernel/Bus/VirtIO/Device.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/Generic/DeviceControlDevice.h>
@@ -39,7 +40,6 @@
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Net/NetworkTask.h>
 #include <Kernel/Net/NetworkingManagement.h>
 #include <Kernel/Prekernel/Prekernel.h>

Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp

@@ -8,7 +8,7 @@
 #include <AK/Singleton.h>
 #include <Kernel/API/MousePacket.h>
 #include <Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Sections.h>

Kernel/Arch/x86_64/InterruptManagement.cpp

@@ -11,7 +11,7 @@
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #include <Kernel/Arch/x86_64/Interrupts/IOAPIC.h>
 #include <Kernel/Arch/x86_64/Interrupts/PIC.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/MultiProcessor/Parser.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Interrupts/SharedIRQHandler.h>

Kernel/Arch/x86_64/PCI/Initializer.cpp

@@ -6,10 +6,10 @@
 
 #include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/x86_64/IO.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/BusDirectory.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Library/Panic.h>

Kernel/BootInfo.h → Kernel/Boot/BootInfo.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/StringView.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VirtualAddress.h>
-#include <Kernel/Multiboot.h>
 
 namespace Kernel::Memory {
 class PageTableEntry;

Kernel/CommandLine.cpp → Kernel/Boot/CommandLine.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>

Kernel/Bus/USB/USBManagement.cpp

@@ -5,10 +5,10 @@
  */
 
 #include <AK/Singleton.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBManagement.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/BusDirectory.h>
 #include <Kernel/Sections.h>
 

Kernel/Bus/VirtIO/Device.cpp

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Bus/VirtIO/Console.h>
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Bus/VirtIO/RNG.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::VirtIO {

Kernel/CMakeLists.txt

@@ -19,6 +19,7 @@ set(KERNEL_SOURCES
  Arch/init.cpp
  Arch/PageFault.cpp
  Arch/DeferredCallPool.cpp
+ Boot/CommandLine.cpp
  Bus/PCI/Controller/HostController.cpp
  Bus/PCI/Controller/MemoryBackedHostBridge.cpp
  Bus/PCI/Controller/VolumeManagementDevice.cpp
@@ -40,7 +41,6 @@ set(KERNEL_SOURCES
  Bus/VirtIO/Device.cpp
  Bus/VirtIO/Queue.cpp
  Bus/VirtIO/RNG.cpp
- CommandLine.cpp
  Devices/AsyncDeviceRequest.cpp
  Devices/Audio/AC97.cpp
  Devices/Audio/Channel.cpp

Kernel/Devices/HID/Management.cpp

@@ -9,7 +9,7 @@
 #if ARCH(X86_64)
 # include <Kernel/Arch/x86_64/ISABus/I8042Controller.h>
 #endif
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Devices/HID/Device.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Firmware/ACPI/Parser.h>

Kernel/Devices/Storage/ATA/AHCI/Controller.cpp

@@ -9,8 +9,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Arch/Delay.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>
 #include <Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h>
 #include <Kernel/Library/LockRefPtr.h>

Kernel/Devices/Storage/NVMe/NVMeController.cpp

@@ -10,8 +10,8 @@
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/SafeMem.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Devices/Storage/NVMe/NVMeController.h>
 #include <Kernel/Devices/Storage/StorageManagement.h>

Kernel/Devices/Storage/StorageManagement.cpp

@@ -16,10 +16,10 @@
 #if ARCH(AARCH64)
 # include <Kernel/Arch/aarch64/RPi/SDHostController.h>
 #endif
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Controller/VolumeManagementDevice.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>

Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/Error.h>
 #include <AK/Try.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/ConstantInformation.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.h>

Kernel/Firmware/ACPI/Initialize.cpp

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>

Kernel/Firmware/ACPI/Parser.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/Firmware/ACPI/Definitions.h>

Kernel/Graphics/GraphicsManagement.cpp

@@ -9,17 +9,17 @@
 #if ARCH(X86_64)
 # include <Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h>
 #endif
+#include <Kernel/Boot/CommandLine.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Graphics/Bochs/GraphicsAdapter.h>
 #include <Kernel/Graphics/Console/BootFramebufferConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
 #include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
 #include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Library/Panic.cpp

@@ -11,7 +11,7 @@
 #elif ARCH(AARCH64)
 # include <Kernel/Arch/aarch64/RPi/Watchdog.h>
 #endif
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Tasks/Thread.h>

Kernel/Memory/MemoryManager.cpp

@@ -10,7 +10,8 @@
 #include <Kernel/Arch/PageDirectory.h>
 #include <Kernel/Arch/PageFault.h>
 #include <Kernel/Arch/RegisterState.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/InterruptDisabler.h>
@@ -21,7 +22,6 @@
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/PhysicalRegion.h>
 #include <Kernel/Memory/SharedInodeVMObject.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/Process.h>

Kernel/Net/NetworkingManagement.cpp

@@ -5,11 +5,11 @@
  */
 
 #include <AK/Singleton.h>
+#include <Kernel/Boot/CommandLine.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Library/KString.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Net/Intel/E1000ENetworkAdapter.h>
 #include <Kernel/Net/Intel/E1000NetworkAdapter.h>
 #include <Kernel/Net/LoopbackAdapter.h>

Kernel/Prekernel/Prekernel.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #ifdef __cplusplus
+# include <Kernel/Boot/Multiboot.h>
 # include <Kernel/Memory/PhysicalAddress.h>
 # include <Kernel/Memory/VirtualAddress.h>
-# include <Kernel/Multiboot.h>
 #endif
 
 #define MAX_KERNEL_SIZE 0x4000000

Kernel/Prekernel/init.cpp

@@ -7,9 +7,9 @@
  */
 
 #include <AK/Types.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VirtualAddress.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <LibC/elf.h>
 #include <LibELF/Relocation.h>

Kernel/Sections.h

@@ -9,7 +9,7 @@
 #include <AK/Platform.h>
 #ifdef __cplusplus
 # include <AK/Types.h>
-# include <Kernel/BootInfo.h>
+# include <Kernel/Boot/BootInfo.h>
 #endif
 
 #define READONLY_AFTER_INIT __attribute__((section(".ro_after_init")))

Kernel/Syscalls/beep.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #if ARCH(X86_64)
 # include <Kernel/Arch/x86_64/PCSpeaker.h>
 #endif

Kernel/TTY/ConsoleManagement.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <AK/Singleton.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Graphics/GraphicsManagement.h>

Kernel/TTY/VirtualConsole.cpp

@@ -11,7 +11,7 @@
 #if ARCH(X86_64)
 # include <Kernel/Arch/x86_64/PCSpeaker.h>
 #endif
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Graphics/GraphicsManagement.h>

Kernel/Time/TimeManagement.cpp

@@ -23,7 +23,7 @@
 #endif
 
 #include <Kernel/Arch/CurrentTime.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/PerformanceManager.h>