summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-11-22 14:58:37 +0200
committerAvi Kivity <avi@redhat.com>2009-11-22 14:58:37 +0200
commitfd2f064e15f85f5ccbb3cce2bf6dc1cb92ca0f6d (patch)
tree45c91faeb10a95d76a2647abc4e1c135c558111e /pc-bios
parentMerge commit '715a664ac4ca3b9e44ffbc0ca41ecd91fbe96656' into upstream-merge (diff)
parentfix parallel build (diff)
downloadqemu-kvm-fd2f064e15f85f5ccbb3cce2bf6dc1cb92ca0f6d.tar.gz
qemu-kvm-fd2f064e15f85f5ccbb3cce2bf6dc1cb92ca0f6d.tar.bz2
qemu-kvm-fd2f064e15f85f5ccbb3cce2bf6dc1cb92ca0f6d.zip
Merge commit 'f527c57935e22b56952d1ed1af36070b682ecf70' into upstream-merge
* commit 'f527c57935e22b56952d1ed1af36070b682ecf70': fix parallel build qdev: Check if unplug handler exists before calling it Makefile: Fix definition of pxe-*.bin blobs eepro100: Add missing .exit initialisation eepro100: Fix boot ROM support Makefile: Prettify logging serial: Add interface to set reference oscillator frequency microblaze: Move the kcmdline out of the way. microblaze: Restore env when raising unmapped bus access. microblaze: Unbreak reset. Fix ARM MCore secondary cpu boot Reject late rom loading Fix ARM system emulation Conflicts: Makefile Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/pxe-i82559er.bin (renamed from pc-bios/pxe-eepro100.bin)bin56832 -> 56832 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/pxe-eepro100.bin b/pc-bios/pxe-i82559er.bin
index 2ca59ec36..2ca59ec36 100644
--- a/pc-bios/pxe-eepro100.bin
+++ b/pc-bios/pxe-i82559er.bin
Binary files differ