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

Revert parts accidentally committed 2 commits ago.

Browse source
This commit is contained in:
Vladimir Serbinenko 2015-05-07 16:21:34 +02:00
parent cfe2ae8936
commit 9f731abc7f
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gentpl.py
View file

@ -759,7 +759,7 @@ def image(defn, platform):
if test x$(TARGET_APPLE_LINKER) = x1; then \ if test x$(TARGET_APPLE_LINKER) = x1; then \
$(MACHO2IMG) $< $@; \ $(MACHO2IMG) $< $@; \
else \ else \
$(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .hash -R .dynsym -R .dynstr -R .rel.text $< $@; \ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version $< $@; \
fi fi
""") """)

11
grub-core/loader/i386/linux.c
View file

@ -69,6 +69,7 @@ static grub_addr_t prot_mode_target;
static void *initrd_mem; static void *initrd_mem;
static grub_addr_t initrd_mem_target; static grub_addr_t initrd_mem_target;
static grub_size_t prot_init_space; static grub_size_t prot_init_space;
static grub_uint32_t initrd_pages;
static struct grub_relocator *relocator = NULL; static struct grub_relocator *relocator = NULL;
static void *efi_mmap_buf; static void *efi_mmap_buf;
static grub_size_t maximal_cmdline_size; static grub_size_t maximal_cmdline_size;
@ -1045,7 +1046,7 @@ static grub_err_t
grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[]) int argc, char *argv[])
{ {
grub_size_t size = 0, aligned_size = 0; grub_size_t size = 0;
grub_addr_t addr_min, addr_max; grub_addr_t addr_min, addr_max;
grub_addr_t addr; grub_addr_t addr;
grub_err_t err; grub_err_t err;
@ -1067,7 +1068,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
size = grub_get_initrd_size (&initrd_ctx); size = grub_get_initrd_size (&initrd_ctx);
aligned_size = ALIGN_UP (size, 4096);
initrd_pages = (page_align (size) >> 12);
/* Get the highest address available for the initrd. */ /* Get the highest address available for the initrd. */
if (grub_le_to_cpu16 (linux_params.version) >= 0x0203) if (grub_le_to_cpu16 (linux_params.version) >= 0x0203)
@ -1095,7 +1097,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
addr_min = (grub_addr_t) prot_mode_target + prot_init_space; addr_min = (grub_addr_t) prot_mode_target + prot_init_space;
/* Put the initrd as high as possible, 4KiB aligned. */ /* Put the initrd as high as possible, 4KiB aligned. */
addr = (addr_max - aligned_size) & ~0xFFF; addr = (addr_max - size) & ~0xFFF;
if (addr < addr_min) if (addr < addr_min)
{ {
@ -1106,8 +1108,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
{ {
grub_relocator_chunk_t ch; grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_align (relocator, &ch, err = grub_relocator_alloc_chunk_align (relocator, &ch,
addr_min, addr, aligned_size, addr_min, addr, size, 0x1000,
0x1000,
GRUB_RELOCATOR_PREFERENCE_HIGH, GRUB_RELOCATOR_PREFERENCE_HIGH,
1); 1);
if (err) if (err)

1
grub-core/loader/linux.c
View file

@ -205,7 +205,6 @@ grub_initrd_init (int argc, char *argv[],
initrd_ctx->nfiles++; initrd_ctx->nfiles++;
initrd_ctx->components[i].size initrd_ctx->components[i].size
= grub_file_size (initrd_ctx->components[i].file); = grub_file_size (initrd_ctx->components[i].file);
if (argc != 1)
initrd_ctx->size += ALIGN_UP (initrd_ctx->components[i].size, 4); initrd_ctx->size += ALIGN_UP (initrd_ctx->components[i].size, 4);
} }