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

2009-07-15 Pavel Roskin <proski@gnu.org>

Browse source 
* boot/i386/pc/boot.S (kernel_segment): Remove.
	(copy_buffer): Use GRUB_BOOT_MACHINE_KERNEL_ADDR in segment 0
	for destination.
This commit is contained in:
proski 2009-07-15 14:58:07 +00:00
parent 40b132c562
commit 7bd8f5bfe1
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2009-07-15 Pavel Roskin <proski@gnu.org> 2009-07-15 Pavel Roskin <proski@gnu.org>
* boot/i386/pc/boot.S (kernel_segment): Remove.
(copy_buffer): Use GRUB_BOOT_MACHINE_KERNEL_ADDR in segment 0
for destination.
* boot/i386/pc/boot.S (boot_version): Remove. * boot/i386/pc/boot.S (boot_version): Remove.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_VER_MAJ): * include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_VER_MAJ):
Remove. Remove.

12
boot/i386/pc/boot.S
View file

@ -94,8 +94,6 @@ cylinder_start:
kernel_address: kernel_address:
.word GRUB_BOOT_MACHINE_KERNEL_ADDR .word GRUB_BOOT_MACHINE_KERNEL_ADDR
kernel_segment:
.word GRUB_BOOT_MACHINE_KERNEL_SEG
. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR . = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
kernel_sector: kernel_sector:
@ -372,13 +370,6 @@ setup_sectors:
movw %es, %bx movw %es, %bx
copy_buffer: copy_buffer:
#ifdef APPLE_CC
kernel_segment_abs = ABS (kernel_segment)
movw (kernel_segment_abs), %es
#else
movw ABS(kernel_segment), %es
#endif
/* /*
* We need to save %cx and %si because the startup code in * We need to save %cx and %si because the startup code in
* kernel uses them without initializing them. * kernel uses them without initializing them.
@ -389,7 +380,8 @@ copy_buffer:
movw $0x100, %cx movw $0x100, %cx
movw %bx, %ds movw %bx, %ds
xorw %si, %si xorw %si, %si
xorw %di, %di movw $GRUB_BOOT_MACHINE_KERNEL_ADDR, %di
movw %si, %es
cld cld