diff --git a/x86_64/harddrive.asm b/x86_64/disk.asm similarity index 100% rename from x86_64/harddrive.asm rename to x86_64/disk.asm diff --git a/x86_64/livedisk.asm b/x86_64/livedisk.asm deleted file mode 100644 index 25b473a737024ce12b2534e2b09b97d6aad5c162..0000000000000000000000000000000000000000 --- a/x86_64/livedisk.asm +++ /dev/null @@ -1,19 +0,0 @@ -%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_live" - align 512, db 0 -.end: -.length equ kernel_file.end - kernel_file -.length_sectors equ .length / 512