From cd646a1ab7c3743caf9a69bfc878771c8aa892f8 Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Sat, 18 Nov 2023 13:59:45 +0200
Subject: [PATCH] Bootloader do some directory restructuring

---
 bootloader/.gitignore                |  3 ---
 bootloader/CMakeLists.txt            | 17 +----------------
 bootloader/bios/CMakeLists.txt       | 18 ++++++++++++++++++
 bootloader/{ => bios}/boot.S         |  0
 bootloader/{ => bios}/command_line.S |  0
 bootloader/{ => bios}/disk.S         |  0
 bootloader/{ => bios}/elf.S          |  0
 bootloader/{ => bios}/ext2.S         |  0
 bootloader/{ => bios}/framebuffer.S  |  0
 bootloader/{ => bios}/linker.ld      |  0
 bootloader/{ => bios}/memory_map.S   |  0
 bootloader/{ => bios}/utils.S        |  0
 bootloader/installer/.gitignore      |  1 +
 13 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 bootloader/.gitignore
 create mode 100644 bootloader/bios/CMakeLists.txt
 rename bootloader/{ => bios}/boot.S (100%)
 rename bootloader/{ => bios}/command_line.S (100%)
 rename bootloader/{ => bios}/disk.S (100%)
 rename bootloader/{ => bios}/elf.S (100%)
 rename bootloader/{ => bios}/ext2.S (100%)
 rename bootloader/{ => bios}/framebuffer.S (100%)
 rename bootloader/{ => bios}/linker.ld (100%)
 rename bootloader/{ => bios}/memory_map.S (100%)
 rename bootloader/{ => bios}/utils.S (100%)
 create mode 100644 bootloader/installer/.gitignore

diff --git a/bootloader/.gitignore b/bootloader/.gitignore
deleted file mode 100644
index 1f20c0de..00000000
--- a/bootloader/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-test.img
-build/
-installer/build/
diff --git a/bootloader/CMakeLists.txt b/bootloader/CMakeLists.txt
index 93724c12..0a2f30c6 100644
--- a/bootloader/CMakeLists.txt
+++ b/bootloader/CMakeLists.txt
@@ -1,18 +1,3 @@
 cmake_minimum_required(VERSION 3.26)
 
-project(bootloader ASM)
-
-set(BOOTLOADER_SOURCES
-	boot.S
-	command_line.S
-	disk.S
-	elf.S
-	ext2.S
-	framebuffer.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)
+add_subdirectory(bios)
diff --git a/bootloader/bios/CMakeLists.txt b/bootloader/bios/CMakeLists.txt
new file mode 100644
index 00000000..73151fcd
--- /dev/null
+++ b/bootloader/bios/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.26)
+
+project(bootloader ASM)
+
+set(BOOTLOADER_SOURCES
+	boot.S
+	command_line.S
+	disk.S
+	elf.S
+	ext2.S
+	framebuffer.S
+	memory_map.S
+	utils.S
+)
+
+add_executable(bootloader ${BOOTLOADER_SOURCES})
+target_link_options(bootloader PRIVATE LINKER:-T,${CMAKE_CURRENT_SOURCE_DIR}/linker.ld)
+target_link_options(bootloader PRIVATE -nostdlib)
diff --git a/bootloader/boot.S b/bootloader/bios/boot.S
similarity index 100%
rename from bootloader/boot.S
rename to bootloader/bios/boot.S
diff --git a/bootloader/command_line.S b/bootloader/bios/command_line.S
similarity index 100%
rename from bootloader/command_line.S
rename to bootloader/bios/command_line.S
diff --git a/bootloader/disk.S b/bootloader/bios/disk.S
similarity index 100%
rename from bootloader/disk.S
rename to bootloader/bios/disk.S
diff --git a/bootloader/elf.S b/bootloader/bios/elf.S
similarity index 100%
rename from bootloader/elf.S
rename to bootloader/bios/elf.S
diff --git a/bootloader/ext2.S b/bootloader/bios/ext2.S
similarity index 100%
rename from bootloader/ext2.S
rename to bootloader/bios/ext2.S
diff --git a/bootloader/framebuffer.S b/bootloader/bios/framebuffer.S
similarity index 100%
rename from bootloader/framebuffer.S
rename to bootloader/bios/framebuffer.S
diff --git a/bootloader/linker.ld b/bootloader/bios/linker.ld
similarity index 100%
rename from bootloader/linker.ld
rename to bootloader/bios/linker.ld
diff --git a/bootloader/memory_map.S b/bootloader/bios/memory_map.S
similarity index 100%
rename from bootloader/memory_map.S
rename to bootloader/bios/memory_map.S
diff --git a/bootloader/utils.S b/bootloader/bios/utils.S
similarity index 100%
rename from bootloader/utils.S
rename to bootloader/bios/utils.S
diff --git a/bootloader/installer/.gitignore b/bootloader/installer/.gitignore
new file mode 100644
index 00000000..567609b1
--- /dev/null
+++ b/bootloader/installer/.gitignore
@@ -0,0 +1 @@
+build/