[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2408] 2009-07-15 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2408] 2009-07-15 Pavel Roskin <address@hidden> |
Date: |
Wed, 15 Jul 2009 14:54:19 +0000 |
Revision: 2408
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2408
Author: proski
Date: 2009-07-15 14:54:18 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
2009-07-15 Pavel Roskin <address@hidden>
* 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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/boot/i386/pc/boot.S
trunk/grub2/include/grub/i386/pc/boot.h
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-07-13 23:57:11 UTC (rev 2407)
+++ trunk/grub2/ChangeLog 2009-07-15 14:54:18 UTC (rev 2408)
@@ -1,3 +1,11 @@
+2009-07-15 Pavel Roskin <address@hidden>
+
+ * 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 <address@hidden>
* include/grub/i386/coreboot/machine.h: Rename
Modified: trunk/grub2/boot/i386/pc/boot.S
===================================================================
--- trunk/grub2/boot/i386/pc/boot.S 2009-07-13 23:57:11 UTC (rev 2407)
+++ trunk/grub2/boot/i386/pc/boot.S 2009-07-15 14:54:18 UTC (rev 2408)
@@ -65,6 +65,7 @@
* this area.
*/
+ . = _start + GRUB_BOOT_MACHINE_BPB_START
. = _start + 4
/* scratch space */
@@ -91,14 +92,19 @@
* End of BIOS parameter block.
*/
+ . = _start + GRUB_BOOT_MACHINE_VER_MAJ
boot_version:
.byte GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
kernel_address:
.word GRUB_BOOT_MACHINE_KERNEL_ADDR
kernel_segment:
.word GRUB_BOOT_MACHINE_KERNEL_SEG
+
+ . = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
kernel_sector:
.long 1, 0
+
+ . = _start + GRUB_BOOT_MACHINE_BOOT_DRIVE
boot_drive:
.byte 0xff /* the disk to load kernel from */
/* 0xff means use the boot drive */
@@ -477,8 +483,8 @@
* sneaky, huh?
*/
+ . = _start + GRUB_BOOT_MACHINE_PART_START
part_start:
- . = _start + GRUB_BOOT_MACHINE_PART_START
probe_values:
.byte 36, 18, 15, 9, 0
Modified: trunk/grub2/include/grub/i386/pc/boot.h
===================================================================
--- trunk/grub2/include/grub/i386/pc/boot.h 2009-07-13 23:57:11 UTC (rev
2407)
+++ trunk/grub2/include/grub/i386/pc/boot.h 2009-07-15 14:54:18 UTC (rev
2408)
@@ -31,17 +31,11 @@
/* The offset of the major version. */
#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. */
#define GRUB_BOOT_MACHINE_KERNEL_SECTOR 0x44
-/* The offset of KERNEL_SEGMENT. */
-#define GRUB_BOOT_MACHINE_KERNEL_SEGMENT 0x42
+/* The offset of BOOT_DRIVE. */
+#define GRUB_BOOT_MACHINE_BOOT_DRIVE 0x4c
/* The offset of BOOT_DRIVE_CHECK. */
#define GRUB_BOOT_MACHINE_DRIVE_CHECK 0x4e
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2408] 2009-07-15 Pavel Roskin <address@hidden>,
Pavel Roskin <=