summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-21 22:26:51 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-25 12:35:30 +0200
commite33058e51fc74fa5548f18bd630c368ca2a24ccf (patch)
tree78249f61dda4cc445852b017afd65c25ec4dd0e6
parent3300e00ffb4a166a7f3f27eb759c5d73df405cba (diff)
downloadbuildroot-e33058e51fc74fa5548f18bd630c368ca2a24ccf.tar.gz
buildroot-e33058e51fc74fa5548f18bd630c368ca2a24ccf.zip
gst-ffmpeg: use the new BR2_ARM_CPU_ARM* options
Instead of using the Config.in options for each individual ARM core, use the newly introduced BR2_ARM_CPU_ARM* options, which exist per ARM architecture. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r--package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index b94fb0f210..5e553638ea 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -51,10 +51,10 @@ endif
# Explicitly disable everything that doesn't match for ARM
# FFMPEG "autodetects" by compiling an extended instruction via AS
# This works on compilers that aren't built for generic by default
-ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
+ifeq ($(BR2_ARM_CPU_ARMV4),y)
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te
endif
-ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
+ifeq ($(BR2_ARM_CPU_ARMV6),y)
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6
else
GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
OpenPOWER on IntegriCloud