summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-21 22:26:53 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-11-06 23:05:51 +0100
commit2cb7b9fe1e258fc2f7fe810dcb69390e4f49e7d0 (patch)
treee6b655a25fd726b1dc8bf680065dedc2652c93c5
parent8918cc50cb19af1e5cd51f2aa933ac755439d576 (diff)
downloadbuildroot-2cb7b9fe1e258fc2f7fe810dcb69390e4f49e7d0.tar.gz
buildroot-2cb7b9fe1e258fc2f7fe810dcb69390e4f49e7d0.zip
gst1-libav: 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> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gstreamer1/gst1-libav/gst1-libav.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
index 6fdf091454..6018504f81 100644
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -49,10 +49,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)
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv5te
endif
-ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
+ifeq ($(BR2_ARM_CPU_ARMV6),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --enable-armv6
else
GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
OpenPOWER on IntegriCloud