diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-20 14:43:21 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-21 08:41:45 +0100 |
| commit | 79a0b861adf332517ba05df3b8c7da8f6e6e5c9b (patch) | |
| tree | c21bf8794fa12522080994a4ea13c2e7cbbeb645 | |
| parent | 41e756a3c0950041073bd2f42b4eb7d6226a9188 (diff) | |
| download | ptxdist-79a0b861adf332517ba05df3b8c7da8f6e6e5c9b.tar.gz ptxdist-79a0b861adf332517ba05df3b8c7da8f6e6e5c9b.tar.xz | |
[libdrm] disable intel KMS support on ARM
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/libdrm.in | 8 | ||||
| -rw-r--r-- | rules/libdrm.make | 15 | ||||
| -rw-r--r-- | rules/xorg-driver-video-intel.in | 1 |
3 files changed, 20 insertions, 4 deletions
diff --git a/rules/libdrm.in b/rules/libdrm.in index 22c6a3a0e..5d56c48e9 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -8,3 +8,11 @@ config LIBDRM This library provides an user-level interface to the DRM device. It is needed for x.org. +if LIBDRM + +config LIBDRM_INTEL + bool + prompt "intel KMS support" + +endif + diff --git a/rules/libdrm.make b/rules/libdrm.make index 37af11d15..d938707e3 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -36,14 +36,19 @@ $(LIBDRM_SOURCE): # Prepare # ---------------------------------------------------------------------------- -LIBDRM_PATH := PATH=$(CROSS_PATH) -LIBDRM_ENV := $(CROSS_ENV) - # # autoconf # LIBDRM_AUTOCONF := $(CROSS_AUTOCONF_USR) +ifndef PTXCONF_ARCH_ARM +ifdef PTXCONF_LIBDRM_INTEL +LIBDRM_AUTOCONF += --enable-intel +else +LIBDRM_AUTOCONF += --disable-intel +endif +endif + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -66,13 +71,15 @@ $(STATEDIR)/libdrm.targetinstall: @$(call install_link, libdrm, libdrm.so.2.4.0, /usr/lib/libdrm.so.2) @$(call install_link, libdrm, libdrm.so.2.4.0, /usr/lib/libdrm.so) -ifdef PTXCONF_XORG_DRIVER_VIDEO_INTEL_DRI +ifndef PTXCONF_ARCH_ARM +ifdef PTXCONF_LIBDRM_INTEL @$(call install_copy, libdrm, 0, 0, 0755, -, \ /usr/lib/libdrm_intel.so.1.0.0) @$(call install_link, libdrm, libdrm_intel.so.1.0.0, /usr/lib/libdrm_intel.so.1) @$(call install_link, libdrm, libdrm_intel.so.1.0.0, /usr/lib/libdrm_intel.so) endif +endif @$(call install_finish, libdrm) diff --git a/rules/xorg-driver-video-intel.in b/rules/xorg-driver-video-intel.in index e441ae0e6..9ba1368a6 100644 --- a/rules/xorg-driver-video-intel.in +++ b/rules/xorg-driver-video-intel.in @@ -40,6 +40,7 @@ comment "X.org Intel Driver" config XORG_DRIVER_VIDEO_INTEL_DRI bool prompt "Enable DRI" + select LIBDRM_INTEL help --enable-dri |