]> git.ipfire.org Git - thirdparty/grub.git/commit
Defer multiboot device parsing until we're in compressed part.
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 12 Nov 2011 20:12:52 +0000 (21:12 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 12 Nov 2011 20:12:52 +0000 (21:12 +0100)
commit5fbdac149b05ce50a3de0dfb6ef6d37e29bc8575
tree119af1ab828703205ef5a0e6f2a75c12e43d39e2
parent691cbb58163628d7244b66997e713f443b8af8e3
Defer multiboot device parsing until we're in compressed part.

* grub-core/boot/i386/pc/lnxboot.S: Remove setting dos_part and
bsd_part. setdevice has fallen into disuse.
* grub-core/boot/i386/pc/startup_raw.S (dos_part): Removed.
(bsd_part): Likewise.
(boot_dev): New variable.
(multiboot_trampoline): Don't parse multiboot device.
Pass multiboot device in %edx.
* grub-core/disk/i386/pc/biosdisk.c (GRUB_MOD_INIT): Parse
grub_boot_device.
* grub-core/kern/i386/pc/init.c (grub_machine_get_bootlocation):
Likewise.
* grub-core/kern/i386/pc/startup.S: Save edx.
(grub_boot_drive): Removed.
(grub_install_dos_part): Likewise.
(grub_install_bsd_part): Likewise.
(grub_boot_device): New variable.
* include/grub/i386/pc/kernel.h (grub_install_dos_part): Removed.
(grub_install_bsd_part): Likewise.
(grub_boot_drive): Likewise.
(grub_boot_device): New variable.
* include/grub/offsets.h (GRUB_KERNEL_I386_PC_INSTALL_DOS_PART):
Removed.
(GRUB_KERNEL_I386_PC_INSTALL_BSD_PART): Likewise.
(GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY): Moved lower.
(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART): Removed.
(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART): Likewise.
* util/grub-install.in: Remove redundant condition.
ChangeLog
grub-core/boot/i386/pc/lnxboot.S
grub-core/boot/i386/pc/startup_raw.S
grub-core/disk/i386/pc/biosdisk.c
grub-core/kern/i386/pc/init.c
grub-core/kern/i386/pc/startup.S
include/grub/i386/pc/kernel.h
include/grub/offsets.h
util/grub-install.in
util/grub-mkimage.c
util/grub-setup.c