summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-04 13:09:06 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-04 13:09:06 +0000
commitd47e95c0c86ea5d8d050bf201ee27bcec617c10e (patch)
treee6d50e9845e1778153c176903e7aadaa7399f9c8 /Makefile
parent57f45b6207a65d96ee4913f33f1ec46cd32a083a (diff)
parentaf87bf290f31d8ef0aaf8f20259fa34e51ed1e7a (diff)
downloadhqemu-d47e95c0c86ea5d8d050bf201ee27bcec617c10e.zip
hqemu-d47e95c0c86ea5d8d050bf201ee27bcec617c10e.tar.gz
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging
* remotes/mcayland/qemu-sparc: sun4m: Add Sun CG3 framebuffer initialisation function sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM sun4m: fix slavio timer RUN/STOP bit sun4m: Set HostID in NVRAM Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a0dafbf..ea6c712 100644
--- a/Makefile
+++ b/Makefile
@@ -320,7 +320,7 @@ ifdef INSTALL_BLOBS
BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
acpi-dsdt.aml q35-acpi-dsdt.aml \
-ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \
+ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \
pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
OpenPOWER on IntegriCloud