vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/boot/i386/pc/lnxboot.S: Use

Browse source 
GRUB_DECOMPRESSOR_MAX_DECOMPRESSOR_SIZE.
	* grub-core/boot/i386/pc/startup_raw.S: Ensure about boot_dev
	location.
	* include/grub/offsets.h (GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE): New
	definition.
	(GRUB_DECOMPRESSOR_I386_PC_MAX_DECOMPRESSOR_SIZE): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-29 23:20:02 +01:00
parent 63fe43f3c3
commit f37c87e1ba
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2012-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/boot/i386/pc/lnxboot.S: Use
GRUB_DECOMPRESSOR_MAX_DECOMPRESSOR_SIZE.
* grub-core/boot/i386/pc/startup_raw.S: Ensure about boot_dev
location.
* include/grub/offsets.h (GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE): New
definition.
(GRUB_DECOMPRESSOR_I386_PC_MAX_DECOMPRESSOR_SIZE): Likewise.
2012-01-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (grub_util_get_dm_node_linear_info): Fix memory leak. * util/getroot.c (grub_util_get_dm_node_linear_info): Fix memory leak.

2
grub-core/boot/i386/pc/lnxboot.S
View file

@ -202,7 +202,7 @@ real_code_2:
movl $(DATA_ADDR + 0x1000), %edi movl $(DATA_ADDR + 0x1000), %edi
movl %ss:(DATA_ADDR + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE), %ecx movl %ss:(DATA_ADDR + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE), %ecx
addl $(0x9000 - 0x8200), %ecx addl $GRUB_DECOMPRESSOR_I386_PC_MAX_DECOMPRESSOR_SIZE, %ecx
2: 2:
call LOCAL(move_memory) call LOCAL(move_memory)

2
grub-core/boot/i386/pc/startup_raw.S
View file

@ -66,7 +66,7 @@ reed_solomon_redundancy:
/* /*
* This is the area for all of the special variables. * This is the area for all of the special variables.
*/ */
. = _start + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
LOCAL(boot_dev): LOCAL(boot_dev):
.byte 0xFF, 0xFF, 0xFF .byte 0xFF, 0xFF, 0xFF
LOCAL(boot_drive): LOCAL(boot_drive):

4
include/grub/offsets.h
View file

@ -31,6 +31,10 @@
/* Offset of field holding no reed solomon length. */ /* Offset of field holding no reed solomon length. */
#define GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH 0x14 #define GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH 0x14
#define GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE 0x18
#define GRUB_DECOMPRESSOR_I386_PC_MAX_DECOMPRESSOR_SIZE (0x9000-0x8200)
/* The segment where the kernel is loaded. */ /* The segment where the kernel is loaded. */
#define GRUB_BOOT_I386_PC_KERNEL_SEG 0x800 #define GRUB_BOOT_I386_PC_KERNEL_SEG 0x800