| Message ID | 1551947777-13044-2-git-send-email-julien.thierry@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support PCI BAR configuration | expand |
On Thu, 7 Mar 2019 08:36:02 +0000 Julien Thierry <julien.thierry@arm.com> wrote: > The vesa framebuffer is only used by architectures that explicitly > require it (i.e. x86). Compile it out for architectures not using it, as > its current implementation might not work for them. > > Signed-off-by: Julien Thierry <julien.thierry@arm.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre. > --- > Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index c4faff6..288e467 100644 > --- a/Makefile > +++ b/Makefile > @@ -94,7 +94,6 @@ OBJS += util/read-write.o > OBJS += util/util.o > OBJS += virtio/9p.o > OBJS += virtio/9p-pdu.o > -OBJS += hw/vesa.o > OBJS += hw/pci-shmem.o > OBJS += kvm-ipc.o > OBJS += builtin-sandbox.o > @@ -219,6 +218,8 @@ else > endif > > ifeq (y,$(ARCH_HAS_FRAMEBUFFER)) > + OBJS += hw/vesa.o > + > CFLAGS_GTK3 := $(shell pkg-config --cflags gtk+-3.0 2>/dev/null) > LDFLAGS_GTK3 := $(shell pkg-config --libs gtk+-3.0 2>/dev/null) > ifeq ($(call try-build,$(SOURCE_GTK3),$(CFLAGS) $(CFLAGS_GTK3),$(LDFLAGS) $(LDFLAGS_GTK3)),y)
diff --git a/Makefile b/Makefile index c4faff6..288e467 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,6 @@ OBJS += util/read-write.o OBJS += util/util.o OBJS += virtio/9p.o OBJS += virtio/9p-pdu.o -OBJS += hw/vesa.o OBJS += hw/pci-shmem.o OBJS += kvm-ipc.o OBJS += builtin-sandbox.o @@ -219,6 +218,8 @@ else endif ifeq (y,$(ARCH_HAS_FRAMEBUFFER)) + OBJS += hw/vesa.o + CFLAGS_GTK3 := $(shell pkg-config --cflags gtk+-3.0 2>/dev/null) LDFLAGS_GTK3 := $(shell pkg-config --libs gtk+-3.0 2>/dev/null) ifeq ($(call try-build,$(SOURCE_GTK3),$(CFLAGS) $(CFLAGS_GTK3),$(LDFLAGS) $(LDFLAGS_GTK3)),y)
The vesa framebuffer is only used by architectures that explicitly require it (i.e. x86). Compile it out for architectures not using it, as its current implementation might not work for them. Signed-off-by: Julien Thierry <julien.thierry@arm.com> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)