merge mainline into mips

diff --cc font/font_cmd.c
index 8b98174096ecdbfa9bbd0c08b40caefdbc7f681b,98216ae442fa50296adc2ad14cdb2c9b7176b001..fe2f5ad4531bac8818e21c2fa82afacd0ac35f6f
--- 1/font/font_cmd.c
--- 2/font/font_cmd.c
+++ b/font/font_cmd.c
@@@ -124,11 -60,9 +124,11 @@@ GRUB_MOD_INIT(font_manager
  {
    grub_font_loader_init ();
  
 +  grub_module_iterate (load_font_module);
 +
    cmd_loadfont =
      grub_register_command ("loadfont", loadfont_command,
-                        "loadfont FILE...",
+                        "FILE...",
                         "Specify one or more font files to load.");
    cmd_lsfonts =
      grub_register_command ("lsfonts", lsfonts_command,

diff --cc loader/powerpc/ieee1275/linux.c
Simple merge

diff --cc mmap/mmap.c
Simple merge

diff --cc term/gfxterm.c
Simple merge

diff --cc util/grub-install.in
index bc7035a2d7f3b4ea85083e0f6b5fccc017528d5d,1fcfb1aca9d4260e5b3fa61687b67e666d971870..c59065072af1ea58de1337a8ea7a3894a2a42aa0
--- 1/util/grub-install.in
--- 2/util/grub-install.in
+++ b/util/grub-install.in
@@@ -34,7 -33,7 +34,7 @@@ font=@datadir@/@PACKAGE_TARNAME@/ascii.
  pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
  
  grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
- if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
 -if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
++if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
      grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
  else
      grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
@@@ -291,15 -281,19 +293,22 @@@ f
  modules="$modules $disk_module"
  modules="$modules $fs_module $partmap_module $devabstraction_module"
  
+ relative_grubdir=`make_system_path_relative_to_its_root ${grubdir}` || exit 1
+ if [ "x${relative_grubdir}" = "x" ] ; then
+     relative_grubdir=/
+ fi
+ 
  prefix_drive=
+ config_opt=
+ 
  if [ "x${devabstraction_module}" = "x" ] ; then
 -    if echo "${install_device}" | grep -qx "(.*)" ; then
 -      install_drive="${install_device}"
 -    else
 -      install_drive="`$grub_probe --target=drive --device ${install_device}`"
 +    if [ x"${install_device}" != x ]; then
 +      if echo "${install_device}" | grep -qx "(.*)" ; then
 +        install_drive="${install_device}"
 +      else
 +        install_drive="`$grub_probe --target=drive --device ${install_device}`"
 +      fi
 +      install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
      fi
      grub_drive="`$grub_probe --target=drive --device ${grub_device}`"
  
@@@ -338,10 -332,8 +346,10 @@@ if [ "${target_cpu}-${platform}" = "i38
      # Now perform the installation.
      $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
          ${install_device} || exit 1
 +elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
 +    $grub_mkimage -f ${font} -d ${pkglibdir} -O elf --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
  else
-     $grub_mkimage -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+     $grub_mkimage ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
  fi
  
  echo "Installation finished. No error reported."