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.

diff --git a/ChangeLog b/ChangeLog
index 94fa54713e76af3c8646b913666bb552c4d357d0..b97f05d195c27d66031005f569226c66d3df9ff9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * kern/efi/mm.c (grub_efi_mm_init): Handle systems with memory maps

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 4a0eae58bf2abbcbf28b9acc184088815d60dd7d..d37feb983364a18b412757a22637cf92defc3d8c 100644 (file)
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -418,9 +418,9 @@ grub_linux_boot (void)
   grub_mmap_iterate (hook);
   params->mmap_size = e820_num;
 
-  grub_printf ("Trampoline at %p. code32=%x, real_mode_mem=%p\n",
-              ((char *) prot_mode_mem + (prot_mode_pages << 12)),
-              (unsigned) params->code32_start, real_mode_mem);
+  grub_dprintf ("linux", "Trampoline at %p. code32=%x, real_mode_mem=%p\n",
+               ((char *) prot_mode_mem + (prot_mode_pages << 12)),
+               (unsigned) params->code32_start, real_mode_mem);
 
   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);
 
   /* XXX there is no way to know if the kernel really supports EFI.  */
-  grub_printf ("   [Linux-bzImage, setup=0x%x, size=0x%x]\n",
-              (unsigned) real_size, (unsigned) prot_size);
+  grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
+               (unsigned) real_size, (unsigned) prot_size);
 
   /* Detect explicitly specified memory size, if any.  */
   linux_mem_size = 0;
@@ -913,8 +913,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  grub_printf ("   [Initrd, addr=0x%x, size=0x%x]\n",
-              (unsigned) addr, (unsigned) size);
+  grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
+               (unsigned) addr, (unsigned) size);
 
   lh->ramdisk_image = addr;
   lh->ramdisk_size = size;

diff --git a/loader/i386/ieee1275/linux.c b/loader/i386/ieee1275/linux.c
index 8780804fd5048b4adfd44dcfdc9864d33197d6a0..9f7556ffa4b22713fa0fc96932129d198971d093 100644 (file)
--- a/loader/i386/ieee1275/linux.c
+++ b/loader/i386/ieee1275/linux.c
@@ -205,8 +205,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
   prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
 
-  grub_printf ("   [Linux-%s, setup=0x%x, size=0x%x]\n",
-               "bzImage", real_size, prot_size);
+  grub_dprintf ("linux", "Linux-%s, setup=0x%x, size=0x%x\n",
+               "bzImage", real_size, prot_size);
 
   grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
   if (grub_errno)

diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 0fa9abc12430b4b793e933c3d912e838c0ca0242..04bc6666136a3d5a93f2e72c77d68de01969039d 100644 (file)
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -182,8 +182,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  grub_printf ("   [Linux-%s, setup=0x%x, size=0x%x]\n",
-              grub_linux_is_bzimage ? "bzImage" : "zImage", real_size, prot_size);
+  grub_dprintf ("linux", "Linux-%s, setup=0x%x, size=0x%x\n",
+               grub_linux_is_bzimage ? "bzImage" : "zImage",
+               real_size, prot_size);
 
   for (i = 1; i < argc; i++)
     if (grub_memcmp (argv[i], "vga=", 4) == 0)