diff --git a/ChangeLog b/ChangeLog index ca4891699..37aabfb92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-07-15 Pavel Roskin + * 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. diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S index fb9094743..e5685dc5e 100644 --- a/boot/i386/pc/boot.S +++ b/boot/i386/pc/boot.S @@ -92,9 +92,6 @@ cylinder_start: * 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: diff --git a/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h index 221ed3882..a91f55abb 100644 --- a/include/grub/i386/pc/boot.h +++ b/include/grub/i386/pc/boot.h @@ -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