diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-04 11:10:08 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-15 14:35:57 +0100 |
| commit | 797baa483280d2dcd4e76badf5d92153e9962f92 (patch) | |
| tree | bd39166b3dd63644478d9c7f6961dd1ac82a86c6 | |
| parent | c5c3e861dbfba6ff0603a9850a6904424ffc758e (diff) | |
| download | ptxdist-797baa483280d2dcd4e76badf5d92153e9962f92.tar.gz ptxdist-797baa483280d2dcd4e76badf5d92153e9962f92.tar.xz | |
mplayer: cleanup advanced options
Neither the currently by ptxdist built 1.0.0rc2 nor the newer
1.0.0rc4 have a --enable-pxa switch, so remove this completely.
For testing on iwmmxt we now have a explicit switch and do not
need to depend on pxa anymore. This leaves a menu with only
one entry left, so remove the menu and put the iwmmxt extension
switch along with the other options.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | rules/mplayer.in | 18 | ||||
| -rw-r--r-- | rules/mplayer.make | 11 |
2 files changed, 3 insertions, 26 deletions
diff --git a/rules/mplayer.in b/rules/mplayer.in index 64d0423d0..7956ddf4d 100644 --- a/rules/mplayer.in +++ b/rules/mplayer.in @@ -78,23 +78,9 @@ config MPLAYER_CODEC_MPEG2 endif -# ----- -# FIXME: This menu should only be visible when -# the current architecture is PXA or ARM -# -menuconfig MPLAYER_ADVANCED - bool - prompt "Advanced Options " - -if MPLAYER_ADVANCED -config MPLAYER_ADVANCED_PXA - bool - prompt "pxa support" - -config MPLAYER_ADVANCED_IWMMXT +config MPLAYER_IWMMXT bool + depends on ARCH_ARM_IWMMXT prompt "iwmmxt extensions" endif - -endif diff --git a/rules/mplayer.make b/rules/mplayer.make index 3c97db43c..3dfc727dc 100644 --- a/rules/mplayer.make +++ b/rules/mplayer.make @@ -328,20 +328,11 @@ endif # # Advanced Options # -ifdef PTXCONF_ARCH_ARM_PXA -ifdef PTXCONF_MPLAYER_ADVANCED_PXA -MPLAYER_AUTOCONF += --enable-pxa -else -MPLAYER_AUTOCONF += --disable-pxa -endif -ifdef PTXCONF_MPLAYER_ADVANCED_IWMMXT +ifdef PTXCONF_MPLAYER_IWMMXT MPLAYER_AUTOCONF += --enable-iwmmxt else MPLAYER_AUTOCONF += --disable-iwmmxt endif -else -MPLAYER_AUTOCONF += --disable-pxa --disable-iwmmxt -endif ifdef PTXCONF_ARCH_ARM_V6 MPLAYER_AUTOCONF += --enable-armv6 |