summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-04-04 07:29:48 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-04-11 07:29:36 (GMT)
commit383932277e91f87bbcf473758452a5b5dec68c4d (patch)
treefc97113aa1e2134e6d2f0383596a2f80f3e48399
parentd6a4227bd83e619385ad12c31ae124a55dbe7a61 (diff)
downloadbuildroot-383932277e91f87bbcf473758452a5b5dec68c4d.tar.gz
buildroot-383932277e91f87bbcf473758452a5b5dec68c4d.tar.bz2
ffmpeg: adjust ARM optimizations
We no longer support ARM less than v3 so kill dead code. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/multimedia/ffmpeg/ffmpeg.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b018ea0..2e88b6b 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -136,7 +136,7 @@ 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_generic_arm)$(BR2_arm7tdmi)$(BR2_arm610)$(BR2_arm710)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t),y)
+ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
FFMPEG_CONF_OPT += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y)