openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

The TMU device requires both X11 and OpenGL.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-4-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-01-30 13:00:04 +01:00 committed by Gerd Hoffmann
parent 99e1a93bbf
commit 57d434407a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default-configs/lm32-softmmu.mak
View File

@ -2,7 +2,7 @@
CONFIG_LM32=y CONFIG_LM32=y
CONFIG_MILKYMIST=y CONFIG_MILKYMIST=y
CONFIG_MILKYMIST_TMU2=$(CONFIG_OPENGL) CONFIG_MILKYMIST_TMU2=$(call land,$(CONFIG_X11),$(CONFIG_OPENGL))
CONFIG_FRAMEBUFFER=y CONFIG_FRAMEBUFFER=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y

4
hw/display/Makefile.objs
View File

@ -29,8 +29,8 @@ obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o
milkymist-tmu2.o-cflags := $(X11_CFLAGS) milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS)
milkymist-tmu2.o-libs := $(X11_LIBS) milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS)
obj-$(CONFIG_OMAP) += omap_dss.o obj-$(CONFIG_OMAP) += omap_dss.o
obj-$(CONFIG_OMAP) += omap_lcdc.o obj-$(CONFIG_OMAP) += omap_lcdc.o

4
hw/lm32/milkymist-hw.h
View File

@ -88,7 +88,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base,
return dev; return dev;
} }
#ifdef CONFIG_OPENGL #if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <epoxy/gl.h> #include <epoxy/gl.h>
#include <epoxy/glx.h> #include <epoxy/glx.h>
@ -103,7 +103,7 @@ static const int glx_fbconfig_attr[] = {
static inline DeviceState *milkymist_tmu2_create(hwaddr base, static inline DeviceState *milkymist_tmu2_create(hwaddr base,
qemu_irq irq) qemu_irq irq)
{ {
#ifdef CONFIG_OPENGL #if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
DeviceState *dev; DeviceState *dev;
Display *d; Display *d;
GLXFBConfig *configs; GLXFBConfig *configs;