Commit 57d43440 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Gerd Hoffmann
Browse files

hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL 



The TMU device requires both X11 and OpenGL.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-4-philmd@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 99e1a93b

default-configs/lm32-softmmu.mak

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


CONFIG_LM32=y

CONFIG_MILKYMIST=y

CONFIG_MILKYMIST_TMU2=$(CONFIG_OPENGL)

CONFIG_MILKYMIST_TMU2=$(call land,$(CONFIG_X11),$(CONFIG_OPENGL))

CONFIG_FRAMEBUFFER=y

CONFIG_PTIMER=y

CONFIG_PFLASH_CFI01=y

hw/display/Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o 
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o



obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o

milkymist-tmu2.o-cflags := $(X11_CFLAGS)

milkymist-tmu2.o-libs := $(X11_LIBS)

milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS)

milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS)



obj-$(CONFIG_OMAP) += omap_dss.o

obj-$(CONFIG_OMAP) += omap_lcdc.o

hw/lm32/milkymist-hw.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, 
    return dev;

}



#ifdef CONFIG_OPENGL

#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)

#include <X11/Xlib.h>

#include <epoxy/gl.h>

#include <epoxy/glx.h>
@@ -103,7 +103,7 @@ static const int glx_fbconfig_attr[] = { 
static inline DeviceState *milkymist_tmu2_create(hwaddr base,

        qemu_irq irq)

{

#ifdef CONFIG_OPENGL

#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)

    DeviceState *dev;

    Display *d;

    GLXFBConfig *configs;