diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-04 13:09:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-04 13:09:06 +0000 |
| commit | d47e95c0c86ea5d8d050bf201ee27bcec617c10e (patch) | |
| tree | e6d50e9845e1778153c176903e7aadaa7399f9c8 /hw/display/Makefile.objs | |
| parent | 57f45b6207a65d96ee4913f33f1ec46cd32a083a (diff) | |
| parent | af87bf290f31d8ef0aaf8f20259fa34e51ed1e7a (diff) | |
| download | hqemu-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 'hw/display/Makefile.objs')
| -rw-r--r-- | hw/display/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 540df82..7ed76a9 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -28,6 +28,7 @@ obj-$(CONFIG_OMAP) += omap_lcdc.o obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o obj-$(CONFIG_SM501) += sm501.o obj-$(CONFIG_TCX) += tcx.o +obj-$(CONFIG_CG3) += cg3.o obj-$(CONFIG_VGA) += vga.o |
