[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/54] hw/display: make edid configurable
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 07/54] hw/display: make edid configurable |
Date: |
Mon, 4 Mar 2019 19:19:27 +0100 |
From: Yang Zhong <address@hidden>
Use CONFIG_EDID to make edid-generate.c and edid-region.c
configurable.
Signed-off-by: Yang Zhong <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/pci.mak | 1 +
default-configs/virtio.mak | 1 +
hw/display/Makefile.objs | 4 +---
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 037636f..0552190 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -49,3 +49,4 @@ CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
CONFIG_ROCKER=y
CONFIG_VFIO=$(CONFIG_LINUX)
CONFIG_VFIO_PCI=y
+CONFIG_EDID=y
diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak
index b653aa0..3abf68a 100644
--- a/default-configs/virtio.mak
+++ b/default-configs/virtio.mak
@@ -6,6 +6,7 @@ CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CRYPTO=y
CONFIG_VIRTIO_GPU=y
+CONFIG_EDID=y
CONFIG_VIRTIO_INPUT=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_RNG=y
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 7c4ae9a..576fca4 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-y += edid-generate.o
+common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o
common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
@@ -15,12 +15,10 @@ 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) += 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
--
1.8.3.1
- [Qemu-devel] [PULL 00/54] Kconfig conversion, excluding ARM and MIPS, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 02/54] 9pfs: remove unnecessary conditionals, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 05/54] minikconfig: add AST, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 03/54] xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 04/54] minikconfig: add parser skeleton, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 10/54] minikconfig: implement allnoconfig and defconfig modes, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 06/54] minikconfig: add semantic analysis, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 07/54] hw/display: make edid configurable,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/54] ide: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 14/54] isa: express dependencies with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 09/54] build: switch to Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 11/54] kconfig: introduce CONFIG_TEST_DEVICES, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 13/54] hw/pci/Makefile.objs: make pcie configurable, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 08/54] kconfig: introduce kconfig files, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 16/54] build: convert sound.mak to Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 17/54] scsi: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig, Paolo Bonzini, 2019/03/04