2023-11-20 13:20:51 +02:00
13 changed files with 20 additions and 19 deletions
--- a/bootloader/.gitignore
+++ b/bootloader/.gitignore
@ -1,3 +0,0 @@
-test.img
-build/
-installer/build/
--- 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)
--- a/bootloader/bios/CMakeLists.txt
+++ 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)
--- a/bootloader/bios/boot.S
+++ b/bootloader/bios/boot.S
--- a/bootloader/bios/command_line.S
+++ b/bootloader/bios/command_line.S
--- a/bootloader/bios/disk.S
+++ b/bootloader/bios/disk.S
--- a/bootloader/bios/elf.S
+++ b/bootloader/bios/elf.S
--- a/bootloader/bios/ext2.S
+++ b/bootloader/bios/ext2.S
--- a/bootloader/bios/framebuffer.S
+++ b/bootloader/bios/framebuffer.S
--- a/bootloader/bios/linker.ld
+++ b/bootloader/bios/linker.ld
--- a/bootloader/bios/memory_map.S
+++ b/bootloader/bios/memory_map.S
--- a/bootloader/bios/utils.S
+++ b/bootloader/bios/utils.S
--- a/bootloader/installer/.gitignore
+++ b/bootloader/installer/.gitignore
@ -0,0 +1 @@
+build/