From 7ca9a961b399e3c763640b89e65ae04fb3e8bc87 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 13 Nov 2023 21:42:58 +0200 Subject: [PATCH] Bootloader move bootloader code from arch directory The os itself only supports x86 so this won't matter. x86_64 and i386 use the same bootloader assembly. --- bootloader/{arch/x86_64 => }/boot.S | 0 bootloader/install.sh | 4 ++-- bootloader/{arch/x86_64 => }/linker.ld | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename bootloader/{arch/x86_64 => }/boot.S (100%) rename bootloader/{arch/x86_64 => }/linker.ld (100%) diff --git a/bootloader/arch/x86_64/boot.S b/bootloader/boot.S similarity index 100% rename from bootloader/arch/x86_64/boot.S rename to bootloader/boot.S diff --git a/bootloader/install.sh b/bootloader/install.sh index 12d7d168..b098764a 100755 --- a/bootloader/install.sh +++ b/bootloader/install.sh @@ -30,10 +30,10 @@ make mkdir -p $BUILD_DIR echo compiling bootloader -x86_64-banan_os-as $CURRENT_DIR/arch/x86_64/boot.S -o $BUILD_DIR/bootloader.o +x86_64-banan_os-as $CURRENT_DIR/boot.S -o $BUILD_DIR/bootloader.o echo linking bootloader -x86_64-banan_os-ld -nostdlib -T $CURRENT_DIR/arch/x86_64/linker.ld $BUILD_DIR/bootloader.o -o $BUILD_DIR/bootloader +x86_64-banan_os-ld -nostdlib -T $CURRENT_DIR/linker.ld $BUILD_DIR/bootloader.o -o $BUILD_DIR/bootloader echo installing bootloader to $INSTALLER_BUILD_DIR/x86_64-banan_os-bootloader-installer $BUILD_DIR/bootloader $BANAN_DISK_IMAGE_PATH $ROOT_PARTITION_GUID diff --git a/bootloader/arch/x86_64/linker.ld b/bootloader/linker.ld similarity index 100% rename from bootloader/arch/x86_64/linker.ld rename to bootloader/linker.ld