[Qemu-commits] [qemu/qemu] b2a575: Add optionrom compatible with fw_cfg DMA version

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b2a575a1c652904600869e774e45bf4c9ed72c55
      
https://github.com/qemu/qemu/commit/b2a575a1c652904600869e774e45bf4c9ed72c55
  Author: Marc Marí <address@hidden>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M .gitignore
    M Makefile
    M hw/i386/pc.c
    M hw/nvram/fw_cfg.c
    M include/hw/i386/pc.h
    M include/hw/nvram/fw_cfg.h
    A pc-bios/linuxboot_dma.bin
    M pc-bios/optionrom/Makefile
    A pc-bios/optionrom/code16gcc.h
    A pc-bios/optionrom/linuxboot_dma.c

  Log Message:
  -----------
  Add optionrom compatible with fw_cfg DMA version

This optionrom is based on linuxboot.S.

Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Richard W.M. Jones <address@hidden>
Message-Id: <address@hidden>
[Add -fno-toplevel-reorder, support clang without -m16. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1c8e93fb41c1ee37853ff7b85ebe1218a4a43780
      
https://github.com/qemu/qemu/commit/1c8e93fb41c1ee37853ff7b85ebe1218a4a43780
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M .gitignore
    M Makefile
    M hw/i386/pc.c
    M hw/nvram/fw_cfg.c
    M include/hw/i386/pc.h
    M include/hw/nvram/fw_cfg.h
    A pc-bios/linuxboot_dma.bin
    M pc-bios/optionrom/Makefile
    A pc-bios/optionrom/code16gcc.h
    A pc-bios/optionrom/linuxboot_dma.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-fwcfg' into 
staging

* Updated fw_cfg option ROM to include DMA support

# gpg: Signature made Thu 14 Jul 2016 14:51:06 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream-fwcfg:
  Add optionrom compatible with fw_cfg DMA version

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/22e28174ae42...1c8e93fb41c1