From c791a1c200da2e999ebccad16c42c749f8ae73bb Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Tue, 14 Nov 2023 03:44:47 +0200
Subject: [PATCH] Bootloader: Build with cmake instead of custom script

---
 CMakeLists.txt            |  1 +
 bootloader/CMakeLists.txt | 15 +++++++++++++++
 bootloader/install.sh     | 32 +++++++++++++-------------------
 script/build.sh           |  1 +
 4 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 bootloader/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad304de9..e0e1dd2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set(BANAN_BIN ${BANAN_SYSROOT}/usr/bin)
 set(BANAN_BOOT ${BANAN_SYSROOT}/boot)
 
 add_subdirectory(kernel)
+add_subdirectory(bootloader)
 add_subdirectory(BAN)
 add_subdirectory(libc)
 add_subdirectory(LibELF)
diff --git a/bootloader/CMakeLists.txt b/bootloader/CMakeLists.txt
new file mode 100644
index 00000000..d57c93f4
--- /dev/null
+++ b/bootloader/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.26)
+
+project(bootloader ASM)
+
+set(BOOTLOADER_SOURCES
+	boot.S
+	command_line.S
+	disk.S
+	memory_map.S
+	utils.S
+)
+
+add_executable(bootloader ${BOOTLOADER_SOURCES})
+target_link_options(bootloader PUBLIC LINKER:-T,${CMAKE_CURRENT_SOURCE_DIR}/linker.ld)
+target_link_options(bootloader PUBLIC -nostdlib)
diff --git a/bootloader/install.sh b/bootloader/install.sh
index a5436b0d..a0c6aeff 100755
--- a/bootloader/install.sh
+++ b/bootloader/install.sh
@@ -7,16 +7,22 @@ if [[ -z $BANAN_DISK_IMAGE_PATH ]]; then
 	exit 1
 fi
 
+if [[ -z $BANAN_BUILD_DIR ]]; then
+	echo "You must set the BANAN_BUILD_DIR environment variable" >&2
+	exit 1
+fi
+
 ROOT_PARTITION_INDEX=2
 ROOT_PARTITION_INFO=$(fdisk -x $BANAN_DISK_IMAGE_PATH | grep "^$BANAN_DISK_IMAGE_PATH" | head -$ROOT_PARTITION_INDEX | tail -1)
 ROOT_PARTITION_GUID=$(echo $ROOT_PARTITION_INFO | cut -d' ' -f6)
 
-CURRENT_DIR=$(dirname $(realpath $0))
+INSTALLER_BUILD_DIR=$(dirname $(realpath $0))/installer/build
+BOOTLOADER_ELF=$BANAN_BUILD_DIR/bootloader/bootloader
 
-INSTALLER_DIR=$CURRENT_DIR/installer
-INSTALLER_BUILD_DIR=$INSTALLER_DIR/build
-
-BUILD_DIR=$CURRENT_DIR/build
+if ! [ -f $BOOTLOADER_ELF ]; then
+	echo "You must build the bootloader first" >&2
+	exit 1
+fi
 
 if ! [ -d $INSTALLER_BUILD_DIR ]; then
 	mkdir -p $INSTALLER_BUILD_DIR
@@ -27,17 +33,5 @@ fi
 cd $INSTALLER_BUILD_DIR
 make
 
-mkdir -p $BUILD_DIR
-
-echo compiling bootloader
-x86_64-banan_os-as $CURRENT_DIR/boot.S        	-o $BUILD_DIR/boot.o
-x86_64-banan_os-as $CURRENT_DIR/command_line.S	-o $BUILD_DIR/command_line.o
-x86_64-banan_os-as $CURRENT_DIR/disk.S			-o $BUILD_DIR/disk.o
-x86_64-banan_os-as $CURRENT_DIR/memory_map.S	-o $BUILD_DIR/memory_map.o
-x86_64-banan_os-as $CURRENT_DIR/utils.S			-o $BUILD_DIR/utils.o
-
-echo linking bootloader
-x86_64-banan_os-ld -nostdlib -T $CURRENT_DIR/linker.ld $BUILD_DIR/boot.o $BUILD_DIR/command_line.o $BUILD_DIR/disk.o $BUILD_DIR/memory_map.o $BUILD_DIR/utils.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
+echo installing bootloader
+$INSTALLER_BUILD_DIR/x86_64-banan_os-bootloader-installer $BOOTLOADER_ELF $BANAN_DISK_IMAGE_PATH $ROOT_PARTITION_GUID
diff --git a/script/build.sh b/script/build.sh
index d51bc084..4e8c98fe 100755
--- a/script/build.sh
+++ b/script/build.sh
@@ -99,6 +99,7 @@ case $1 in
 		;;
 	bootloader)
 		create_image
+		build_target bootloader
 		$BANAN_ROOT_DIR/bootloader/install.sh
 		$BANAN_SCRIPT_DIR/qemu.sh -serial stdio $QEMU_ACCEL
 		;;