Browse Source

Kernel: Improve the aarch64 kernel source files disk layout

James Mintram 3 years ago
parent
commit
d94c7fa417

+ 0 - 0
Kernel/Arch/aarch64/Aarch64_asm_utils.S → Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.S


+ 0 - 0
Kernel/Arch/aarch64/Aarch64_asm_utils.h → Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h


+ 0 - 0
Kernel/Arch/aarch64/Prekernel.h → Kernel/Arch/aarch64/Prekernel/Prekernel.h


+ 0 - 0
Kernel/Arch/aarch64/PrekernelCommon.cpp → Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp


+ 0 - 0
Kernel/Arch/aarch64/PrekernelExceptions.cpp → Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp


+ 0 - 0
Kernel/Arch/aarch64/PrekernelMMU.cpp → Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp


+ 0 - 0
Kernel/Arch/aarch64/boot.S → Kernel/Arch/aarch64/Prekernel/boot.S


+ 0 - 0
Kernel/Arch/aarch64/Framebuffer.cpp → Kernel/Arch/aarch64/RPi/Framebuffer.cpp


+ 0 - 0
Kernel/Arch/aarch64/Framebuffer.h → Kernel/Arch/aarch64/RPi/Framebuffer.h


+ 0 - 0
Kernel/Arch/aarch64/FramebufferMailboxMessages.h → Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h


+ 0 - 0
Kernel/Arch/aarch64/GPIO.cpp → Kernel/Arch/aarch64/RPi/GPIO.cpp


+ 0 - 0
Kernel/Arch/aarch64/GPIO.h → Kernel/Arch/aarch64/RPi/GPIO.h


+ 0 - 0
Kernel/Arch/aarch64/MMIO.cpp → Kernel/Arch/aarch64/RPi/MMIO.cpp


+ 0 - 0
Kernel/Arch/aarch64/MMIO.h → Kernel/Arch/aarch64/RPi/MMIO.h


+ 0 - 0
Kernel/Arch/aarch64/Mailbox.cpp → Kernel/Arch/aarch64/RPi/Mailbox.cpp


+ 0 - 0
Kernel/Arch/aarch64/Mailbox.h → Kernel/Arch/aarch64/RPi/Mailbox.h


+ 0 - 0
Kernel/Arch/aarch64/Timer.cpp → Kernel/Arch/aarch64/RPi/Timer.cpp


+ 0 - 0
Kernel/Arch/aarch64/Timer.h → Kernel/Arch/aarch64/RPi/Timer.h


+ 0 - 0
Kernel/Arch/aarch64/UART.cpp → Kernel/Arch/aarch64/RPi/UART.cpp


+ 0 - 0
Kernel/Arch/aarch64/UART.h → Kernel/Arch/aarch64/RPi/UART.h


+ 23 - 12
Kernel/CMakeLists.txt

@@ -389,22 +389,35 @@ if (NOT "${SERENITY_ARCH}" STREQUAL "aarch64")
         ${CRYPTO_SOURCES}
     )
 else()
+    set(PREKERNEL_SOURCES
+        Arch/aarch64/Prekernel/PrekernelMMU.cpp
+        Arch/aarch64/Prekernel/PrekernelExceptions.cpp
+        Arch/aarch64/Prekernel/PrekernelCommon.cpp
+        Arch/aarch64/Prekernel/boot.S
+        Arch/aarch64/Prekernel/Aarch64_asm_utils.S
+
+        Prekernel/UBSanitizer.cpp
+    )
+    set(RPI_SOURCES
+        Arch/aarch64/RPi/GPIO.cpp
+        Arch/aarch64/RPi/Framebuffer.cpp
+        Arch/aarch64/RPi/Mailbox.cpp
+        Arch/aarch64/RPi/Timer.cpp
+        Arch/aarch64/RPi/UART.cpp
+        Arch/aarch64/RPi/MMIO.cpp
+    )
     set(SOURCES
         ${AK_SOURCES}
+        ${PREKERNEL_SOURCES}
+        ${RPI_SOURCES}
 
         Arch/aarch64/BootPPMParser.cpp
-        Arch/aarch64/CrashHandler.cpp
-        Arch/aarch64/GPIO.cpp
-        Arch/aarch64/Framebuffer.cpp
-        Arch/aarch64/Mailbox.cpp
-        Arch/aarch64/MainIdRegister.cpp
-        Arch/aarch64/MMIO.cpp
+        Arch/aarch64/CrashHandler.cpp        
+        Arch/aarch64/MainIdRegister.cpp        
         Arch/aarch64/PageDirectory.cpp
-        Arch/aarch64/Timer.cpp
-        Arch/aarch64/UART.cpp
         Arch/aarch64/Utils.cpp
 
-        Arch/aarch64/dummy.cpp
+        Arch/aarch64/Dummy.cpp
 
         # Preload specific
         Arch/aarch64/init.cpp
@@ -416,12 +429,10 @@ else()
         Arch/aarch64/boot.S
         Arch/aarch64/Aarch64_asm_utils.S
         Arch/aarch64/vector_table.S
-
         Arch/aarch64/SmapDisabler.cpp
         Arch/aarch64/ScopedCritical.cpp
-        MiniStdLib.cpp
-        Prekernel/UBSanitizer.cpp
 
+        MiniStdLib.cpp
         Heap/kmalloc.cpp
 
         Memory/AddressSpace.cpp