vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2007-10-22 Robert Millan <rmh@aybabtu.com>

Browse source 
* kern/i386/pc/startup.S: Remove `"kern/i386/realmode.S"'.  Include
	`"../realmode.S"'.
	Remove `"kern/i386/loader.S"'.  Include `"../loader.S"'.
This commit is contained in:
robertmh 2007-10-22 20:14:45 +00:00
parent 73fcb0f38d
commit 2ebfc90fdb
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-22 Robert Millan <rmh@aybabtu.com>
* kern/i386/pc/startup.S: Remove `"kern/i386/realmode.S"'. Include
`"../realmode.S"'.
Remove `"kern/i386/loader.S"'. Include `"../loader.S"'.
2007-10-22 Robert Millan <rmh@aybabtu.com> 2007-10-22 Robert Millan <rmh@aybabtu.com>
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove `disk/i386/pc/biosdisk.c'. * conf/i386-pc.rmk (kernel_img_SOURCES): Remove `disk/i386/pc/biosdisk.c'.

4
kern/i386/pc/startup.S
View file

@ -242,7 +242,7 @@ codestart:
*/ */
call EXT_C(grub_main) call EXT_C(grub_main)
#include "kern/i386/realmode.S" #include "../realmode.S"
/* /*
* This is the area for all of the special variables. * This is the area for all of the special variables.
@ -607,7 +607,7 @@ FUNCTION(grub_chainloader_real_boot)
ljmp $0, $GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR ljmp $0, $GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR
.code32 .code32
#include "kern/i386/loader.S" #include "../loader.S"
/* /*
* int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap) * int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)