21 files changed, 23 insertions, 12 deletions
diff --git a/Kernel/Arch/aarch64/Aarch64_asm_utils.S b/Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.S
index 33f2d4de7f..33f2d4de7f 100644
--- a/Kernel/Arch/aarch64/Aarch64_asm_utils.S
+++ b/Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.S
diff --git a/Kernel/Arch/aarch64/Aarch64_asm_utils.h b/Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h
index 5536904b2b..5536904b2b 100644
--- a/Kernel/Arch/aarch64/Aarch64_asm_utils.h
+++ b/Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h
diff --git a/Kernel/Arch/aarch64/Prekernel.h b/Kernel/Arch/aarch64/Prekernel/Prekernel.h
index 1012ad4e3b..1012ad4e3b 100644
--- a/Kernel/Arch/aarch64/Prekernel.h
+++ b/Kernel/Arch/aarch64/Prekernel/Prekernel.h
diff --git a/Kernel/Arch/aarch64/PrekernelCommon.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
index 5f7310daa3..5f7310daa3 100644
--- a/Kernel/Arch/aarch64/PrekernelCommon.cpp
+++ b/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
diff --git a/Kernel/Arch/aarch64/PrekernelExceptions.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
index 9feb7fb821..9feb7fb821 100644
--- a/Kernel/Arch/aarch64/PrekernelExceptions.cpp
+++ b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
diff --git a/Kernel/Arch/aarch64/PrekernelMMU.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
index 31ec573299..31ec573299 100644
--- a/Kernel/Arch/aarch64/PrekernelMMU.cpp
+++ b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
diff --git a/Kernel/Arch/aarch64/boot.S b/Kernel/Arch/aarch64/Prekernel/boot.S
index 4c44b5288a..4c44b5288a 100644
--- a/Kernel/Arch/aarch64/boot.S
+++ b/Kernel/Arch/aarch64/Prekernel/boot.S
diff --git a/Kernel/Arch/aarch64/Framebuffer.cpp b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
index fb99de9adf..fb99de9adf 100644
--- a/Kernel/Arch/aarch64/Framebuffer.cpp
+++ b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
diff --git a/Kernel/Arch/aarch64/Framebuffer.h b/Kernel/Arch/aarch64/RPi/Framebuffer.h
index 2cde37dfdb..2cde37dfdb 100644
--- a/Kernel/Arch/aarch64/Framebuffer.h
+++ b/Kernel/Arch/aarch64/RPi/Framebuffer.h
diff --git a/Kernel/Arch/aarch64/FramebufferMailboxMessages.h b/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
index 7dab801b73..7dab801b73 100644
--- a/Kernel/Arch/aarch64/FramebufferMailboxMessages.h
+++ b/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
diff --git a/Kernel/Arch/aarch64/GPIO.cpp b/Kernel/Arch/aarch64/RPi/GPIO.cpp
index bffba6bade..bffba6bade 100644
--- a/Kernel/Arch/aarch64/GPIO.cpp
+++ b/Kernel/Arch/aarch64/RPi/GPIO.cpp
diff --git a/Kernel/Arch/aarch64/GPIO.h b/Kernel/Arch/aarch64/RPi/GPIO.h
index 4f38f9c376..4f38f9c376 100644
--- a/Kernel/Arch/aarch64/GPIO.h
+++ b/Kernel/Arch/aarch64/RPi/GPIO.h
diff --git a/Kernel/Arch/aarch64/MMIO.cpp b/Kernel/Arch/aarch64/RPi/MMIO.cpp
index a6b270a17d..a6b270a17d 100644
--- a/Kernel/Arch/aarch64/MMIO.cpp
+++ b/Kernel/Arch/aarch64/RPi/MMIO.cpp
diff --git a/Kernel/Arch/aarch64/MMIO.h b/Kernel/Arch/aarch64/RPi/MMIO.h
index 895319d869..895319d869 100644
--- a/Kernel/Arch/aarch64/MMIO.h
+++ b/Kernel/Arch/aarch64/RPi/MMIO.h
diff --git a/Kernel/Arch/aarch64/Mailbox.cpp b/Kernel/Arch/aarch64/RPi/Mailbox.cpp
index d36a5305b4..d36a5305b4 100644
--- a/Kernel/Arch/aarch64/Mailbox.cpp
+++ b/Kernel/Arch/aarch64/RPi/Mailbox.cpp
diff --git a/Kernel/Arch/aarch64/Mailbox.h b/Kernel/Arch/aarch64/RPi/Mailbox.h
index f54eea7c99..f54eea7c99 100644
--- a/Kernel/Arch/aarch64/Mailbox.h
+++ b/Kernel/Arch/aarch64/RPi/Mailbox.h
diff --git a/Kernel/Arch/aarch64/Timer.cpp b/Kernel/Arch/aarch64/RPi/Timer.cpp
index 0a703c180b..0a703c180b 100644
--- a/Kernel/Arch/aarch64/Timer.cpp
+++ b/Kernel/Arch/aarch64/RPi/Timer.cpp
diff --git a/Kernel/Arch/aarch64/Timer.h b/Kernel/Arch/aarch64/RPi/Timer.h
index 27762930bf..27762930bf 100644
--- a/Kernel/Arch/aarch64/Timer.h
+++ b/Kernel/Arch/aarch64/RPi/Timer.h
diff --git a/Kernel/Arch/aarch64/UART.cpp b/Kernel/Arch/aarch64/RPi/UART.cpp
index 36852b6fce..36852b6fce 100644
--- a/Kernel/Arch/aarch64/UART.cpp
+++ b/Kernel/Arch/aarch64/RPi/UART.cpp
diff --git a/Kernel/Arch/aarch64/UART.h b/Kernel/Arch/aarch64/RPi/UART.h
index 7b77cda167..7b77cda167 100644
--- a/Kernel/Arch/aarch64/UART.h
+++ b/Kernel/Arch/aarch64/RPi/UART.h
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 0452c6c19f..9835e1d13b 100644
--- a/Kernel/CMakeLists.txt
+++ b/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