* grub-core/boot/sparc64/ieee1275/boot.S: Fix order of fields.

Also-By: Bob Picco <bob.picco@oracle.com>
This commit is contained in:
Allen Pais 2013-12-19 01:53:56 +01:00 committed by Vladimir Serbinenko
parent 2e238b3708
commit ee281fd0c6
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2013-12-18 Allen Pais <allen.pais@oracle.com>
2013-12-18 Bob Picco <bob.picco@oracle.com>
* grub-core/boot/sparc64/ieee1275/boot.S: Fix order of fields.
2013-12-18 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-18 Vladimir Serbinenko <phcoder@gmail.com>
Make grub_zlib_decompress handle incomplete chunks. Make grub_zlib_decompress handle incomplete chunks.

View file

@ -44,8 +44,8 @@ pic_base:
. = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH . = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH
boot_path: boot_path:
. = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE . = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
kernel_byte: .xword (2 << 9)
boot_path_end: boot_path_end:
kernel_byte: .xword (2 << 9)
kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR
#else #else
#define boot_path (_start + 512 + SCRATCH_PAD_BOOT_SIZE) #define boot_path (_start + 512 + SCRATCH_PAD_BOOT_SIZE)