From 155e86a846b05a7f416fc102d0046c3cb722dd8c Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Thu, 11 May 2017 21:16:35 -0600 Subject: [PATCH] Remove hardcoded kernel/filesystem --- x86_64/{harddrive.asm => disk.asm} | 0 x86_64/livedisk.asm | 19 ------------------- 2 files changed, 19 deletions(-) rename x86_64/{harddrive.asm => disk.asm} (100%) delete mode 100644 x86_64/livedisk.asm 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 25b473a..0000000 --- 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 -- GitLab