| Message ID | 20181005160147.892-2-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | two little bochs-display patches. | expand |
On Fri, Oct 5, 2018 at 9:13 AM Gerd Hoffmann <kraxel@redhat.com> wrote: > > This allows modern architectures which don't care about vga > compatibility (risc-v for example) build bochs-display without > including all vga emulation too. For RISC-V we end up including pci.mak anyway for other things such as NVMe drives. So we don't really need this, but it still seems useful. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > default-configs/pci.mak | 1 + > hw/display/Makefile.objs | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/default-configs/pci.mak b/default-configs/pci.mak > index de53d20ac6..6c7be12779 100644 > --- a/default-configs/pci.mak > +++ b/default-configs/pci.mak > @@ -44,5 +44,6 @@ CONFIG_SDHCI=y > CONFIG_EDU=y > CONFIG_VGA=y > CONFIG_VGA_PCI=y > +CONFIG_BOCHS_DISPLAY=y > CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) > CONFIG_ROCKER=y > diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs > index 780a76b9f0..2a0de16a55 100644 > --- a/hw/display/Makefile.objs > +++ b/hw/display/Makefile.objs > @@ -14,11 +14,11 @@ 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_BLIZZARD) += blizzard.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o > -- > 2.9.3 > >
On Fri, Oct 05, 2018 at 09:22:29AM -0700, Alistair Francis wrote: > On Fri, Oct 5, 2018 at 9:13 AM Gerd Hoffmann <kraxel@redhat.com> wrote: > > > > This allows modern architectures which don't care about vga > > compatibility (risc-v for example) build bochs-display without > > including all vga emulation too. > > For RISC-V we end up including pci.mak anyway for other things such as > NVMe drives. So we don't really need this, but it still seems useful. Hmm, maybe we should split pci.mak into pci-legacy.mak and pci-express.mak then? cheers, Gerd
On 10/05/2018 09:48 AM, Gerd Hoffmann wrote: > On Fri, Oct 05, 2018 at 09:22:29AM -0700, Alistair Francis wrote: >> On Fri, Oct 5, 2018 at 9:13 AM Gerd Hoffmann <kraxel@redhat.com> wrote: >>> >>> This allows modern architectures which don't care about vga >>> compatibility (risc-v for example) build bochs-display without >>> including all vga emulation too. >> >> For RISC-V we end up including pci.mak anyway for other things such as >> NVMe drives. So we don't really need this, but it still seems useful. > > Hmm, maybe we should split pci.mak into pci-legacy.mak and pci-express.mak > then? That sounds like a good idea. Alistair > > cheers, > Gerd >
diff --git a/default-configs/pci.mak b/default-configs/pci.mak index de53d20ac6..6c7be12779 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -44,5 +44,6 @@ CONFIG_SDHCI=y CONFIG_EDU=y CONFIG_VGA=y CONFIG_VGA_PCI=y +CONFIG_BOCHS_DISPLAY=y CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) CONFIG_ROCKER=y diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 780a76b9f0..2a0de16a55 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -14,11 +14,11 @@ 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_BLIZZARD) += blizzard.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
This allows modern architectures which don't care about vga compatibility (risc-v for example) build bochs-display without including all vga emulation too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- default-configs/pci.mak | 1 + hw/display/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)