aboutsummaryrefslogtreecommitdiff
path: root/pc-bios
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-03-19 08:51:50 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-03-19 08:51:50 -0500
commitb8b3e75609bd39a085db7612cb7d36a1944eed23 (patch)
tree781cb4f785d6c33ee5bb8936419ab2db48e7bec6 /pc-bios
parent5c20f4e54a311620861c659dec29d0ee402e8b93 (diff)
parent32b089808f125470b3563bf4209c2301fa35c58e (diff)
downloadqemu-b8b3e75609bd39a085db7612cb7d36a1944eed23.zip
qemu-b8b3e75609bd39a085db7612cb7d36a1944eed23.tar.gz
qemu-b8b3e75609bd39a085db7612cb7d36a1944eed23.tar.bz2
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
* qemu-kvm/memory/urgent: (42 commits) memory: check for watchpoints when getting code ram_addr exec: fix write tlb entry misused as iotlb Sparc: avoid AREG0 wrappers for memory access helpers Sparc: avoid AREG0 for memory access helpers TCG: add 5 arg helpers to def-helper.h softmmu templates: optionally pass CPUState to memory access functions i386: Remove REGPARM sparc64: implement PCI and ISA irqs sparc: reset CPU state on reset apb: use normal PCI device header for PBM device w64: Fix data type of next_tb and tcg_qemu_tb_exec softfloat: fix for C99 vmstate: fix varrays with uint32_t indexes Fix large memory chunks allocation with tcg_malloc. hw/pxa2xx.c: Fix handling of pxa2xx_i2c variable offset within region hw/pxa2xx_lcd.c: drop target_phys_addr_t usage in device state hw/pxa2xx_dma.c: drop target_phys_addr_t usage in device state ARM: Remove unnecessary subpage workarounds malta: Fix display for LED array malta: Use symbolic hardware addresses ...
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/slof.binbin869584 -> 880496 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README
index 5dce355..71f4871 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-20120111.1.
+ built from git tag qemu-slof-20120217.
- 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
index 8554f54..449a7bb 100644
--- a/pc-bios/slof.bin
+++ b/pc-bios/slof.bin
Binary files differ