diff --git a/x86_64/harddrive.asm b/x86_64/harddrive.asm index a2c34aafeca5e0e4720d7da11a78acfddfb6cb4e..052dfe83851c8fd1102a06c45050ce80ceebce12 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 0000000000000000000000000000000000000000..e1cd64311c40e3df51dc625cdb08966a97c21403 --- /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