| Message ID | 20181227063419.12981-7-yang.zhong@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support Kconfig in QEMU | expand |
On 2018-12-27 07:34, Yang Zhong wrote: > Use CONFIG_EDID to make edid-generate.c and edid-region.c > configurable. > > Signed-off-by: Yang Zhong <yang.zhong@intel.com> > --- > default-configs/pci.mak | 1 + > hw/display/Makefile.objs | 4 +--- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/default-configs/pci.mak b/default-configs/pci.mak > index 6c7be12779..171bdf48bc 100644 > --- a/default-configs/pci.mak > +++ b/default-configs/pci.mak > @@ -47,3 +47,4 @@ CONFIG_VGA_PCI=y > CONFIG_BOCHS_DISPLAY=y > CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) > CONFIG_ROCKER=y > +CONFIG_EDID=y > diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs > index 97acd5b6cb..a8e23c8501 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 Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 6c7be12779..171bdf48bc 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -47,3 +47,4 @@ CONFIG_VGA_PCI=y CONFIG_BOCHS_DISPLAY=y CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) CONFIG_ROCKER=y +CONFIG_EDID=y diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 97acd5b6cb..a8e23c8501 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
Use CONFIG_EDID to make edid-generate.c and edid-region.c configurable. Signed-off-by: Yang Zhong <yang.zhong@intel.com> --- default-configs/pci.mak | 1 + hw/display/Makefile.objs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)