diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-15 09:05:26 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-15 09:05:26 +0000 |
commit | 6d4e18925a65306afabaad7b63a4588c18919e99 (patch) | |
tree | 3d46feb2372756bc5dcb37641f3c8030431fcf23 /pc-bios | |
parent | 659f807c0a700317a7a0fae7a6e6ebfe68bfbbc4 (diff) | |
parent | a64ae610b978dfd8ccfb7f6c5d4cfe62d7542fbd (diff) | |
download | qemu-6d4e18925a65306afabaad7b63a4588c18919e99.zip qemu-6d4e18925a65306afabaad7b63a4588c18919e99.tar.gz qemu-6d4e18925a65306afabaad7b63a4588c18919e99.tar.bz2 |
Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf: (40 commits)
pseries: Increase default NVRAM size
target-ppc: Don't use hwaddr to represent hardware state
PPC: e500: pci: Export slot2irq calculation
PPC: E500plat: Make a lot of PCI slots available
PPC: E500: Move PCI slot information into params
PPC: E500: Generate dt pci irq map dynamically
PPC: E500: PCI: Make IRQ calculation more generic
PPC: E500: PCI: Make first slot qdev settable
openpic: Accelerate pending irq search
openpic: fix minor coding style issues
MSI-X: Fix endianness
PPC: e500: Declare pci bridge as bridge
PPC: e500: Add MSI support
openpic: add Shared MSI support
openpic: make brr1 model specific
openpic: convert to qdev
openpic: remove irq_out
openpic: rename openpic_t to OpenPICState
openpic: convert simple reg operations to builtin bitops
openpic: remove unused type variable
...
Diffstat (limited to 'pc-bios')
-rw-r--r-- | pc-bios/README | 2 | ||||
-rw-r--r-- | pc-bios/slof.bin | bin | 878640 -> 880832 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README index 3037130..eff3de7 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -17,7 +17,7 @@ - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware implementation for certain IBM POWER hardware. The sources are at https://github.com/dgibson/SLOF, and the image currently in qemu is - built from git tag qemu-slof-20120731. + built from git tag qemu-slof-20121018. - sgabios (the Serial Graphics Adapter option ROM) provides a means for legacy x86 software to communicate with an attached serial console as diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin Binary files differindex 84ba6b8..3410f4f 100644 --- a/pc-bios/slof.bin +++ b/pc-bios/slof.bin |