[2409] 2009-07-15 Pavel Roskin <[email protected]>

Revision: 2409
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2409
Author:   proski
Date:     2009-07-15 14:55:24 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
2009-07-15  Pavel Roskin  <[email protected]>

	* boot/i386/pc/boot.S (boot_version): Remove.
	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_VER_MAJ):
	Remove.

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-15 14:54:18 UTC (rev 2408)
+++ trunk/grub2/ChangeLog	2009-07-15 14:55:24 UTC (rev 2409)
@@ -1,5 +1,9 @@
 2009-07-15  Pavel Roskin  <[email protected]>
 
+	* boot/i386/pc/boot.S (boot_version): Remove.
+	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_VER_MAJ):
+	Remove.
+
 	* include/grub/i386/pc/boot.h: Sort all offsets.
 	(GRUB_BOOT_MACHINE_KERNEL_ADDRESS): Remove, it's unused.
 	(GRUB_BOOT_MACHINE_KERNEL_SEGMENT): Likewise.

Modified: trunk/grub2/boot/i386/pc/boot.S
===================================================================
--- trunk/grub2/boot/i386/pc/boot.S	2009-07-15 14:54:18 UTC (rev 2408)
+++ trunk/grub2/boot/i386/pc/boot.S	2009-07-15 14:55:24 UTC (rev 2409)
@@ -92,9 +92,6 @@
 	 * 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:

Modified: trunk/grub2/include/grub/i386/pc/boot.h
===================================================================
--- trunk/grub2/include/grub/i386/pc/boot.h	2009-07-15 14:54:18 UTC (rev 2408)
+++ trunk/grub2/include/grub/i386/pc/boot.h	2009-07-15 14:55:24 UTC (rev 2409)
@@ -28,9 +28,6 @@
 /* The offset of the end of BPB (BIOS Parameter Block).  */
 #define GRUB_BOOT_MACHINE_BPB_END	0x3e
 
-/* The offset of the major version.  */
-#define GRUB_BOOT_MACHINE_VER_MAJ	0x3e
-
 /* The offset of KERNEL_SECTOR.  */
 #define GRUB_BOOT_MACHINE_KERNEL_SECTOR	0x44