moved bootloader to subdirectory

10 files changed, 11 insertions, 11 deletions

diff --git a/src/Makefile b/src/Makefile
index 9688ebc..c89f9c3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,8 +24,8 @@ image.bin: boot.bin kernel.bin magic.bin
 	cat image.tmp magic.bin > image.bin
 	truncate -s 1474560 image.bin
 	
-boot.bin: boot.asm boot_gdt.asm stage1_functions.asm stage2_real_functions.asm stage2_pm_functions.asm stage2_switch_mode.asm stage2_a20.asm
-	$(NASM) boot.asm -DMAGIC='"$(MAGIC)"' -f bin -o boot.bin
+boot.bin: boot/boot.asm boot/boot_gdt.asm boot/stage1_functions.asm boot/stage2_real_functions.asm boot/stage2_pm_functions.asm boot/stage2_switch_mode.asm boot/stage2_a20.asm
+	$(NASM) boot/boot.asm -DMAGIC='"$(MAGIC)"' -f bin -o boot.bin
 
 kernel.bin: kernel.elf
 	$(OBJCOPY) -O binary kernel.elf kernel.bin
@@ -41,8 +41,8 @@ kernel.elf: kernel.o kernel_asm.o console.o vgatext.o serial.o port.o port_asm.o
 		keyboard.o mouse.o \
 		string.o stdlib.o stdio.o setjmp.o
 
-magic.bin: magic.asm
-	$(NASM) magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin
+magic.bin: boot/magic.asm
+	$(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin
 	
 kernel.o: kernel.c
 	$(CC) $(CFLAGS) -c -o kernel.o kernel.c
diff --git a/src/boot.asm b/src/boot/boot.asm
index 68cbb52..c3cb57e 100644
--- a/src/boot.asm
+++ b/src/boot/boot.asm
@@ -49,7 +49,7 @@
 ; jump over variables and subroutines of stage 1 and execute stage 2
 	jmp stage2
 	
-%include "stage1_functions.asm"
+%include "boot/stage1_functions.asm"
 		
 DISK_ERROR:
 	db "DISK ERROR ", 0
@@ -163,9 +163,9 @@ MESSAGE_STAGE_2_A20_DISABLED:
 MESSAGE_HALTED_REAL:
 	db "Operating system halted in real mode", 13, 10, 0
 
-%include "stage2_real_functions.asm"	
-%include "stage2_switch_mode.asm"
-%include "stage2_a20.asm"
+%include "boot/stage2_real_functions.asm"	
+%include "boot/stage2_switch_mode.asm"
+%include "boot/stage2_a20.asm"
 
 [bits 32]
 
@@ -216,8 +216,8 @@ MESSAGE_CALL_C_ENTRY:
 MESSAGE_HALTED:
 	db "Operating system halted", 0
 
-%include "stage2_pm_functions.asm"
-%include "stage2_check_magic.asm"
+%include "boot/stage2_pm_functions.asm"
+%include "boot/stage2_check_magic.asm"
 
 ; make sure we have full sectors, stage 1 is 512 bytes, so we
 ; have to will up 3 sectors
diff --git a/src/boot_gdt.asm b/src/boot/boot_gdt.asm
index 87e1585..87e1585 100644
--- a/src/boot_gdt.asm
+++ b/src/boot/boot_gdt.asm
diff --git a/src/magic.asm b/src/boot/magic.asm
index f7aaf0d..f7aaf0d 100644
--- a/src/magic.asm
+++ b/src/boot/magic.asm
diff --git a/src/stage1_functions.asm b/src/boot/stage1_functions.asm
index bdb2aac..bdb2aac 100644
--- a/src/stage1_functions.asm
+++ b/src/boot/stage1_functions.asm
diff --git a/src/stage2_a20.asm b/src/boot/stage2_a20.asm
index c0951ad..c0951ad 100644
--- a/src/stage2_a20.asm
+++ b/src/boot/stage2_a20.asm
diff --git a/src/stage2_check_magic.asm b/src/boot/stage2_check_magic.asm
index 1deaf05..1deaf05 100644
--- a/src/stage2_check_magic.asm
+++ b/src/boot/stage2_check_magic.asm
diff --git a/src/stage2_pm_functions.asm b/src/boot/stage2_pm_functions.asm
index f3c348b..f3c348b 100644
--- a/src/stage2_pm_functions.asm
+++ b/src/boot/stage2_pm_functions.asm
diff --git a/src/stage2_real_functions.asm b/src/boot/stage2_real_functions.asm
index d49bfce..d49bfce 100644
--- a/src/stage2_real_functions.asm
+++ b/src/boot/stage2_real_functions.asm
diff --git a/src/stage2_switch_mode.asm b/src/boot/stage2_switch_mode.asm
index 4082fda..9259e08 100644
--- a/src/stage2_switch_mode.asm
+++ b/src/boot/stage2_switch_mode.asm
@@ -1,6 +1,6 @@
 [bits 16]
 
-%include "boot_gdt.asm"
+%include "boot/boot_gdt.asm"
 
 switch_to_protected_mode:
 	; switch off interrupts for now, we don't