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

Sync up other versions of the Linux loader with Robert Millan's

Browse source 
change of 2010-01-09, "Make loader output a bit more user-friendly".
* loader/i386/efi/linux.c (grub_linux_boot): Move debug info to
grub_dprintf().
(grub_cmd_linux): Likewise.
(grub_cmd_initrd): Likewise.
* loader/i386/ieee1275/linux.c (grub_cmd_linux): Likewise.
* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
This commit is contained in:
Colin Watson 2010-06-23 09:16:39 +01:00
parent d6e98a17d7
commit e726542fa3
4 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2010-06-23 Colin Watson <cjwatson@ubuntu.com>
Sync up other versions of the Linux loader with Robert Millan's
change of 2010-01-09, "Make loader output a bit more user-friendly".
* loader/i386/efi/linux.c (grub_linux_boot): Move debug info to
grub_dprintf().
(grub_cmd_linux): Likewise.
(grub_cmd_initrd): Likewise.
* loader/i386/ieee1275/linux.c (grub_cmd_linux): Likewise.
* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
2010-06-21 Colin Watson <cjwatson@ubuntu.com> 2010-06-21 Colin Watson <cjwatson@ubuntu.com>
* kern/efi/mm.c (grub_efi_mm_init): Handle systems with memory maps * kern/efi/mm.c (grub_efi_mm_init): Handle systems with memory maps

14
loader/i386/efi/linux.c
View file

@ -418,9 +418,9 @@ grub_linux_boot (void)
grub_mmap_iterate (hook); grub_mmap_iterate (hook);
params->mmap_size = e820_num; params->mmap_size = e820_num;
grub_printf ("Trampoline at %p. code32=%x, real_mode_mem=%p\n", grub_dprintf ("linux", "Trampoline at %p. code32=%x, real_mode_mem=%p\n",
((char *) prot_mode_mem + (prot_mode_pages << 12)), ((char *) prot_mode_mem + (prot_mode_pages << 12)),
(unsigned) params->code32_start, real_mode_mem); (unsigned) params->code32_start, real_mode_mem);
modevar = grub_env_get ("gfxpayload"); modevar = grub_env_get ("gfxpayload");
@ -732,8 +732,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE); grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
/* XXX there is no way to know if the kernel really supports EFI. */ /* XXX there is no way to know if the kernel really supports EFI. */
grub_printf (" [Linux-bzImage, setup=0x%x, size=0x%x]\n", grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
(unsigned) real_size, (unsigned) prot_size); (unsigned) real_size, (unsigned) prot_size);
/* Detect explicitly specified memory size, if any. */ /* Detect explicitly specified memory size, if any. */
linux_mem_size = 0; linux_mem_size = 0;
@ -913,8 +913,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
} }
grub_printf (" [Initrd, addr=0x%x, size=0x%x]\n", grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
(unsigned) addr, (unsigned) size); (unsigned) addr, (unsigned) size);
lh->ramdisk_image = addr; lh->ramdisk_image = addr;
lh->ramdisk_size = size; lh->ramdisk_size = size;

4
loader/i386/ieee1275/linux.c
View file

@ -205,8 +205,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
real_size = setup_sects << GRUB_DISK_SECTOR_BITS; real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE; prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
grub_printf (" [Linux-%s, setup=0x%x, size=0x%x]\n", grub_dprintf ("linux", "Linux-%s, setup=0x%x, size=0x%x\n",
"bzImage", real_size, prot_size); "bzImage", real_size, prot_size);
grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE); grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
if (grub_errno) if (grub_errno)

5
loader/i386/pc/linux.c
View file

@ -182,8 +182,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
} }
grub_printf (" [Linux-%s, setup=0x%x, size=0x%x]\n", grub_dprintf ("linux", "Linux-%s, setup=0x%x, size=0x%x\n",
grub_linux_is_bzimage ? "bzImage" : "zImage", real_size, prot_size); grub_linux_is_bzimage ? "bzImage" : "zImage",
real_size, prot_size);
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
if (grub_memcmp (argv[i], "vga=", 4) == 0) if (grub_memcmp (argv[i], "vga=", 4) == 0)