diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-09-21 19:01:27 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-09-21 19:07:58 +0200 |
| commit | d1499890dd5c4cb4337eedce4aee6e394bf1bd20 (patch) | |
| tree | 06b531fb50df46609b4d4663b5d743ffa67131f6 | |
| parent | 96d3b24a82bfaafcd422a79de94513362184379c (diff) | |
| download | ptxdist-d1499890dd5c4cb4337eedce4aee6e394bf1bd20.tar.gz ptxdist-d1499890dd5c4cb4337eedce4aee6e394bf1bd20.tar.xz | |
xorg-server: improve kdrive/xfbdev options
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/xorg-server.in | 43 | ||||
| -rw-r--r-- | rules/xorg-server.make | 22 |
2 files changed, 58 insertions, 7 deletions
diff --git a/rules/xorg-server.in b/rules/xorg-server.in index e8a2048b6..d2767671a 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -90,9 +90,11 @@ menuconfig XORG_SERVER # xinerama triggered select XORG_PROTO_XINERAMA if XORG_SERVER_EXT_XINERAMA + # for kdrive + select TSLIB if XORG_SERVER_TSLIB + # FIXME: unclear dependencies #select XORG_LIB_XXF86VM if XORG_SERVER_EXT_XV - #select TSLIB if XORG_SERVER_TSLIB #select XORG_LIB_X11 #select XORG_LIB_XAW #select XORG_PROTO_XF86MISC @@ -201,6 +203,7 @@ config XORG_SERVER_XFAKE config XORG_SERVER_XFBDEV bool + select XORG_SERVER_KDRIVE prompt "xfbdev server" help FIXME @@ -247,12 +250,6 @@ config XORG_SERVER_OPT_SECURE_RPC help Use secure RPC authentication (SUN-DES-1) -config XORG_SERVER_TSLIB - bool - prompt "tslib" - help - FIXME - config XORG_SERVER_UDEV bool select UDEV_LIBUDEV @@ -264,6 +261,38 @@ config XORG_SERVER_UDEV endmenu +if XORG_SERVER_KDRIVE + +menu "kdrive options " + +config XORG_SERVER_TSLIB + bool + prompt "tslib support" + help + Build kdrive tslib touchscreen support + +config XORG_SERVER_KDRIVE_KBD + bool + prompt "kbd driver" + help + Build kbd driver for kdrive + +config XORG_SERVER_KDRIVE_MOUSE + bool + prompt "mouse driver" + help + Build mouse driver for kdrive + +config XORG_SERVER_KDRIVE_EVDEV + bool + prompt "evdev driver" + help + Build evdev driver for kdrive + +endmenu + +endif + # ---------------------------------------------------------------------------- menu "xorg extensions " diff --git a/rules/xorg-server.make b/rules/xorg-server.make index 09cb37c65..6002e47dd 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -313,6 +313,24 @@ else XORG_SERVER_AUTOCONF += --disable-xfbdev endif +ifdef PTXCONF_XORG_SERVER_KDRIVE_KBD +XORG_SERVER_AUTOCONF += --enable-kdrive-kbd +else +XORG_SERVER_AUTOCONF += --disable-kdrive-kbd +endif + +ifdef PTXCONF_XORG_SERVER_KDRIVE_MOUSE +XORG_SERVER_AUTOCONF += --enable-kdrive-mouse +else +XORG_SERVER_AUTOCONF += --disable-kdrive-mouse +endif + +ifdef PTXCONF_XORG_SERVER_KDRIVE_EVDEV +XORG_SERVER_AUTOCONF += --enable-kdrive-evdev +else +XORG_SERVER_AUTOCONF += --disable-kdrive-evdev +endif + ifdef PTXCONF_XORG_SERVER_OPT_INSTALL_SETUID XORG_SERVER_AUTOCONF += --enable-install-setuid else @@ -394,6 +412,10 @@ ifdef PTXCONF_XORG_SERVER_XWIN @$(call install_copy, xorg-server, 0, 0, 0755, -, \ $(XORG_PREFIX)/bin/Xwin) endif +ifdef PTXCONF_XORG_SERVER_XFBDEV + @$(call install_copy, xorg-server, 0, 0, 0755, -, \ + $(XORG_PREFIX)/bin/Xfbdev) +endif ifdef PTXCONF_XORG_SERVER_XORG @$(call install_copy, xorg-server, 0, 0, 0755, -, \ |