From 4ceab7a2969b48f5a9adc74e849ed84a94a92b0f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 19 Nov 2016 20:19:41 -0700
Subject: [PATCH] Allow compiling both livedisk and harddrive

---
 x86_64/harddrive.asm |  2 +-
 x86_64/livedisk.asm  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 x86_64/livedisk.asm

diff --git a/x86_64/harddrive.asm b/x86_64/harddrive.asm
index a2c34aa..052dfe8 100644
--- a/x86_64/harddrive.asm
+++ b/x86_64/harddrive.asm
@@ -18,4 +18,4 @@ kernel_file:
 .length equ kernel_file.end - kernel_file
 .length_sectors equ .length / 512
 
-;incbin "build/userspace/filesystem.bin"
+incbin "build/filesystem.bin"
diff --git a/x86_64/livedisk.asm b/x86_64/livedisk.asm
new file mode 100644
index 0000000..e1cd643
--- /dev/null
+++ b/x86_64/livedisk.asm
@@ -0,0 +1,19 @@
+%include "bootsector.asm"
+
+startup_start:
+%ifdef ARCH_i386
+    %include "startup-i386.asm"
+%endif
+
+%ifdef ARCH_x86_64
+    %include "startup-x86_64.asm"
+%endif
+align 512, db 0
+startup_end:
+
+kernel_file:
+  incbin "build/kernel/kernel_live"
+  align 512, db 0
+.end:
+.length equ kernel_file.end - kernel_file
+.length_sectors equ .length / 512
-- 
GitLab