From c96a3f0c4843adf538aa8dc812a9abf6da616113 Mon Sep 17 00:00:00 2001 From: Timon Kruiper Date: Mon, 9 May 2022 23:43:36 +0200 Subject: [PATCH] Kernel: Move the aarch64 boot.S out of the Prekernel directory --- Kernel/Arch/aarch64/{Prekernel => }/boot.S | 0 Kernel/CMakeLists.txt | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename Kernel/Arch/aarch64/{Prekernel => }/boot.S (100%) diff --git a/Kernel/Arch/aarch64/Prekernel/boot.S b/Kernel/Arch/aarch64/boot.S similarity index 100% rename from Kernel/Arch/aarch64/Prekernel/boot.S rename to Kernel/Arch/aarch64/boot.S diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 7d87d87141..aa9f95b43b 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -398,8 +398,6 @@ if (NOT "${SERENITY_ARCH}" STREQUAL "aarch64") ) else() set(PREKERNEL_SOURCES - Arch/aarch64/Prekernel/boot.S - Prekernel/UBSanitizer.cpp ) set(RPI_SOURCES @@ -415,6 +413,7 @@ else() ${PREKERNEL_SOURCES} ${RPI_SOURCES} + Arch/aarch64/boot.S Arch/aarch64/BootPPMParser.cpp Arch/aarch64/CrashHandler.cpp Arch/aarch64/Dummy.cpp