diff options
| author | Peter Maydell | 2018-10-15 16:03:45 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-15 16:03:45 +0200 |
| commit | ff56877e911782dedc9a424233fd3f62369c258c (patch) | |
| tree | 7b613ed6f36bb4a50bf1b01743348d59d0899fdf /hw/display/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui2-20181012-pull-request' ... (diff) | |
| parent | Makefile: Install new vgabios binaries (diff) | |
| download | qemu-ff56877e911782dedc9a424233fd3f62369c258c.tar.gz qemu-ff56877e911782dedc9a424233fd3f62369c258c.tar.xz qemu-ff56877e911782dedc9a424233fd3f62369c258c.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181015-pull-request' into staging
vga: config tweaks, edid updates, qxl bugfix, install new vgabios blobs.
# gpg: Signature made Mon 15 Oct 2018 10:05:03 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20181015-pull-request:
Makefile: Install new vgabios binaries
hw/display/cirrus_vga: Move "isa-cirrus-vga" device into a separate file
i2c: switch ddc to use the new edid generator
qxl: check qxl_phys2virt return value
bochs-display: wire up edid support
display: add separate config option for bochs-display
edid: fix alignment issues
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/Makefile.objs')
| -rw-r--r-- | hw/display/Makefile.objs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 780a76b9f0..97acd5b6cb 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -5,6 +5,7 @@ common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o common-obj-$(CONFIG_ADS7846) += ads7846.o common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o +common-obj-$(call land,$(CONFIG_VGA_CIRRUS),$(CONFIG_VGA_ISA))+=cirrus_vga_isa.o common-obj-$(CONFIG_G364FB) += g364fb.o common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o common-obj-$(CONFIG_PL110) += pl110.o @@ -14,11 +15,12 @@ common-obj-$(CONFIG_SSD0323) += ssd0323.o common-obj-$(CONFIG_XEN) += xenfb.o common-obj-$(CONFIG_VGA_PCI) += vga-pci.o -common-obj-$(CONFIG_VGA_PCI) += bochs-display.o common-obj-$(CONFIG_VGA_PCI) += edid-region.o common-obj-$(CONFIG_VGA_ISA) += vga-isa.o common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o +common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o +common-obj-$(CONFIG_BOCHS_DISPLAY) += edid-region.o common-obj-$(CONFIG_BLIZZARD) += blizzard.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o |