vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow compiling both livedisk and harddrive

Browse source
This commit is contained in:
Jeremy Soller 2016-11-19 20:19:41 -07:00
parent 98d6be210f
commit 41811ad98d
9 changed files with 282 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootloader/x86_64/harddrive.asm
View file

@ -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"

19
bootloader/x86_64/livedisk.asm Normal file
View file

@ -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