Merge mainline into yeeloongfw

diff --cc bus/usb/ohci.c
Simple merge

diff --cc conf/mips-qemu-mips.rmk
Simple merge

diff --cc conf/mips-yeeloong.rmk
Simple merge

diff --cc include/grub/term.h
Simple merge

diff --cc util/grub-mkimage.c
Simple merge

diff --cc video/sm712.c
index cee9831,44bfd74..a58032c
--- 1/video/sm712.c
--- 2/video/sm712.c
+++ b/video/sm712.c
@@@ -198,19 -143,19 +195,6 @@@ grub_video_sm712_setup (unsigned int wi
    return err;
  }
  
--static grub_err_t
--grub_video_sm712_set_palette (unsigned int start, unsigned int count,
--                            struct grub_video_palette_data *palette_data)
--{
--  if (framebuffer.index_color_mode)
--    {
--      /* TODO: Implement setting indexed color mode palette to hardware.  */
--    }
--
--  /* Then set color to emulated palette.  */
--  return grub_video_fb_set_palette (start, count, palette_data);
--}
--
  static grub_err_t
  grub_video_sm712_swap_buffers (void)
  {
@@@ -250,7 -197,7 +236,7 @@@ static struct grub_video_adapter grub_v
      .setup = grub_video_sm712_setup,
      .get_info = grub_video_fb_get_info,
      .get_info_and_fini = grub_video_sm712_get_info_and_fini,
--    .set_palette = grub_video_sm712_set_palette,
++    .set_palette = grub_video_fb_set_palette,
      .get_palette = grub_video_fb_get_palette,
      .set_viewport = grub_video_fb_set_viewport,
      .get_viewport = grub_video_fb_get_viewport,