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

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

Browse source 
* include/grub/i386/pc/boot.h: Sort all offsets.
	(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Remove, it's unused.
	(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Likewise.
	* boot/i386/pc/boot.S: Assert location of every offset listed in
	include/grub/i386/pc/boot.h.
This commit is contained in:
proski 2009-07-15 14:54:18 +00:00
parent 44b5d87973
commit 2059157753
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2009-07-15 Pavel Roskin <proski@gnu.org>
* include/grub/i386/pc/boot.h: Sort all offsets.
(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Remove, it's unused.
(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Likewise.
* boot/i386/pc/boot.S: Assert location of every offset listed in
include/grub/i386/pc/boot.h.
2009-07-13 Pavel Roskin <proski@gnu.org> 2009-07-13 Pavel Roskin <proski@gnu.org>
* include/grub/i386/coreboot/machine.h: Rename * include/grub/i386/coreboot/machine.h: Rename

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

@ -65,6 +65,7 @@ start:
* this area. * this area.
*/ */
. = _start + GRUB_BOOT_MACHINE_BPB_START
. = _start + 4 . = _start + 4
/* scratch space */ /* scratch space */
@ -91,14 +92,19 @@ cylinder_start:
* End of BIOS parameter block. * End of BIOS parameter block.
*/ */
. = _start + GRUB_BOOT_MACHINE_VER_MAJ
boot_version: boot_version:
.byte GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR .byte GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
kernel_address: kernel_address:
.word GRUB_BOOT_MACHINE_KERNEL_ADDR .word GRUB_BOOT_MACHINE_KERNEL_ADDR
kernel_segment: kernel_segment:
.word GRUB_BOOT_MACHINE_KERNEL_SEG .word GRUB_BOOT_MACHINE_KERNEL_SEG
. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
kernel_sector: kernel_sector:
.long 1, 0 .long 1, 0
. = _start + GRUB_BOOT_MACHINE_BOOT_DRIVE
boot_drive: boot_drive:
.byte 0xff /* the disk to load kernel from */ .byte 0xff /* the disk to load kernel from */
/* 0xff means use the boot drive */ /* 0xff means use the boot drive */
@ -477,8 +483,8 @@ nt_magic:
* sneaky, huh? * sneaky, huh?
*/ */
part_start:
. = _start + GRUB_BOOT_MACHINE_PART_START . = _start + GRUB_BOOT_MACHINE_PART_START
part_start:
probe_values: probe_values:
.byte 36, 18, 15, 9, 0 .byte 36, 18, 15, 9, 0

10
include/grub/i386/pc/boot.h
View file

@ -31,17 +31,11 @@
/* The offset of the major version. */ /* The offset of the major version. */
#define GRUB_BOOT_MACHINE_VER_MAJ 0x3e #define GRUB_BOOT_MACHINE_VER_MAJ 0x3e
/* The offset of BOOT_DRIVE. */
#define GRUB_BOOT_MACHINE_BOOT_DRIVE 0x4c
/* The offset of KERNEL_ADDRESS. */
#define GRUB_BOOT_MACHINE_KERNEL_ADDRESS 0x40
/* The offset of KERNEL_SECTOR. */ /* The offset of KERNEL_SECTOR. */
#define GRUB_BOOT_MACHINE_KERNEL_SECTOR 0x44 #define GRUB_BOOT_MACHINE_KERNEL_SECTOR 0x44
/* The offset of KERNEL_SEGMENT. */ /* The offset of BOOT_DRIVE. */
#define GRUB_BOOT_MACHINE_KERNEL_SEGMENT 0x42 #define GRUB_BOOT_MACHINE_BOOT_DRIVE 0x4c
/* The offset of BOOT_DRIVE_CHECK. */ /* The offset of BOOT_DRIVE_CHECK. */
#define GRUB_BOOT_MACHINE_DRIVE_CHECK 0x4e #define GRUB_BOOT_MACHINE_DRIVE_CHECK 0x4e