[Qemu-commits] [qemu/qemu] fd3ece: Add OpenHack'Ware submodule

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fd3ece2533730eb4ab2dd787a1c1418b38b40d6a
      
https://github.com/qemu/qemu/commit/fd3ece2533730eb4ab2dd787a1c1418b38b40d6a
  Author: Andreas Färber <address@hidden>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M .gitmodules
    M pc-bios/README
    R pc-bios/ohw.diff
    A roms/openhackware

  Log Message:
  -----------
  Add OpenHack'Ware submodule

This replaces the ohw.diff file on top of v0.4.1.

Signed-off-by: Andreas Färber <address@hidden>


  Commit: 21143b615aaf6f1661a1a6e69f00a39e456cc168
      
https://github.com/qemu/qemu/commit/21143b615aaf6f1661a1a6e69f00a39e456cc168
  Author: Andreas Färber <address@hidden>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M pc-bios/ppc_rom.bin
    M roms/openhackware

  Log Message:
  -----------
  prep: Update ppc_rom.bin

Functionally, this is a revert of Jocelyn's r3309 /
55aa45ddde3283cdd781326d001f7456bf02f684 (Quickly hack PowerPC BIOS
able to boot on CDROM again.), for which we do not have the sources.

Therefore the sources used are v0.4.1 plus pc-bios/ohw.diff plus a
workaround turning IDE errors into warnings.

Signed-off-by: Andreas Färber <address@hidden>


  Commit: 750036a848ea913ba6343718ffa70da98f7eef6b
      
https://github.com/qemu/qemu/commit/750036a848ea913ba6343718ffa70da98f7eef6b
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M .gitmodules
    M pc-bios/README
    R pc-bios/ohw.diff
    M pc-bios/ppc_rom.bin
    A roms/openhackware

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

PReP machine and devices

* ppc_rom.bin update and submodule

# gpg: Signature made Wed 12 Mar 2014 17:32:40 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/prep-for-upstream:
  prep: Update ppc_rom.bin
  Add OpenHack'Ware submodule

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


Compare: https://github.com/qemu/qemu/compare/2f23e9ae2cc3...750036a848ea