summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/Config.in.arm11
-rw-r--r--package/ffmpeg/ffmpeg.mk2
-rw-r--r--package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk2
-rw-r--r--package/gstreamer1/gst1-libav/gst1-libav.mk2
-rw-r--r--package/libplayer/Config.in4
-rw-r--r--package/mplayer/Config.in4
-rw-r--r--package/nettle/nettle.mk2
-rw-r--r--package/nodejs/Config.in4
-rw-r--r--package/qt5/Config.in2
-rw-r--r--package/speex/Config.in2
-rw-r--r--package/uclibc/Config.in2
-rw-r--r--package/vo-aacenc/vo-aacenc.mk2
-rw-r--r--package/webkit/Config.in2
13 files changed, 14 insertions, 27 deletions
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index b7a9ed60aa..4cc41f10a1 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -44,12 +44,6 @@ choice
help
Specific CPU variant to use
-config BR2_arm7tdmi
- bool "arm7tdmi"
- select BR2_ARM_CPU_HAS_THUMB
-config BR2_arm720t
- bool "arm720t"
- select BR2_ARM_CPU_HAS_THUMB
config BR2_arm920t
bool "arm920t"
select BR2_ARM_CPU_HAS_THUMB
@@ -347,9 +341,6 @@ config BR2_ENDIAN
default "BIG" if BR2_armeb
config BR2_GCC_TARGET_CPU
- default "arm7tdmi" if BR2_arm7tdmi
- default "arm7tdmi" if BR2_arm720t
- default "arm7tdmi" if BR2_arm740t
default "arm920" if BR2_arm920
default "arm920t" if BR2_arm920t
default "arm922t" if BR2_arm922t
@@ -371,8 +362,6 @@ config BR2_GCC_TARGET_CPU
default "iwmmxt" if BR2_iwmmxt
config BR2_GCC_TARGET_ARCH
- default "armv4t" if BR2_arm7tdmi
- default "armv4t" if BR2_arm720t
default "armv4t" if BR2_arm920t
default "armv4t" if BR2_arm922t
default "armv5te" if BR2_arm926t
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index fae558abf2..f8c1526517 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -256,7 +256,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_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
+ifeq ($(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)
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 6534f93107..f18ab1821e 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -51,7 +51,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_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
+ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
index 121f2ee4c7..7a0182e45c 100644
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -52,7 +52,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_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
+ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
diff --git a/package/libplayer/Config.in b/package/libplayer/Config.in
index be7e0f0be1..4f5404ce4a 100644
--- a/package/libplayer/Config.in
+++ b/package/libplayer/Config.in
@@ -19,8 +19,8 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER
depends on BR2_LARGEFILE
# mplayer
# Broken support for <ARMv5
- depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \
- || BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm)
+ depends on !(BR2_arm920t || BR2_arm920t || BR2_arm922t || BR2_fa526 \
+ || BR2_strongarm)
select BR2_PACKAGE_MPLAYER
config BR2_PACKAGE_LIBPLAYER_GSTREAMER
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index bacd744dd8..8b5d05e41f 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_MPLAYER
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
|| BR2_microblaze || BR2_aarch64 || BR2_nios2)
# Broken support for <ARMv5
- depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \
- || BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm)
+ depends on !(BR2_arm920t || BR2_arm920t || BR2_arm922t || BR2_fa526 \
+ || BR2_strongarm)
depends on BR2_LARGEFILE
help
MPlayer is a movie player which runs on many systems and supports
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index c23b4fa37a..647100a443 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -15,7 +15,7 @@ NETTLE_LICENSE_FILES = COPYING.LIB
NETTLE_CONF_OPT = --disable-openssl
# ARM assembly requires v6+ ISA
-ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_arm10t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)
+ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_arm10t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)
NETTLE_CONF_OPT += --disable-assembler
endif
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 5ebaa9a70a..344b7f6f1b 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_NODEJS
depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
depends on !BR2_MIPS_SOFT_FLOAT
# ARM needs BLX, so v5t+
- depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+ depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526)
# uses fork()
depends on BR2_USE_MMU
help
@@ -18,7 +18,7 @@ config BR2_PACKAGE_NODEJS
comment "nodejs needs a toolchain w/ C++, IPv6, largefile, threads"
depends on BR2_USE_MMU
depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
- depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+ depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526)
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 5713c41f8c..d36852eb40 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
# Javascript engine is only available on certain architectures
depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
# ARM needs BLX, so v5t+
- depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+ depends on !(BR2_arm920t || BR2_arm922t || BR2_fa526)
default y
comment "Qt5 needs a toolchain w/ wchar, IPv6, NPTL, C++"
diff --git a/package/speex/Config.in b/package/speex/Config.in
index 3f8d6c3ab6..ab743fe03d 100644
--- a/package/speex/Config.in
+++ b/package/speex/Config.in
@@ -13,7 +13,7 @@ if BR2_PACKAGE_SPEEX
config BR2_PACKAGE_SPEEX_ARM4
bool
default y
- depends on BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_strongarm || BR2_fa526
+ depends on BR2_arm920t || BR2_arm922t || BR2_strongarm || BR2_fa526
config BR2_PACKAGE_SPEEX_ARM5E
default y
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 50214299bb..84c2f14b40 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -200,8 +200,6 @@ config BR2_UCLIBC_ARM_TYPE
string
depends on BR2_UCLIBC_TARGET_ARCH = "arm"
default GENERIC_ARM if BR2_fa526
- default ARM7TDMI if BR2_arm7tdmi
- default ARM720T if BR2_arm720t
default ARM920T if BR2_arm920t
default ARM922T if BR2_arm922t
default ARM926T if BR2_arm926t
diff --git a/package/vo-aacenc/vo-aacenc.mk b/package/vo-aacenc/vo-aacenc.mk
index 503876fc27..d34ced9bd6 100644
--- a/package/vo-aacenc/vo-aacenc.mk
+++ b/package/vo-aacenc/vo-aacenc.mk
@@ -26,7 +26,7 @@ VO_AACENC_CFLAGS += -mfpu=neon
else
VO_AACENC_CONF_OPT += --disable-armv7neon
-ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),)
+ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),)
VO_AACENC_CONF_OPT += --enable-armv5e
else
VO_AACENC_CONF_OPT += --disable-armv5e
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 41122872e4..21da2b2392 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS
bool
# ARM needs BLX, so v5t+
default y if (BR2_arm || BR2_armeb) && \
- !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t || BR2_arm922t || BR2_fa526)
+ !(BR2_arm920t || BR2_arm922t || BR2_fa526)
default y if BR2_i386 || BR2_mips || BR2_mipsel || \
BR2_sh || BR2_sparc || BR2_x86_64
depends on BR2_USE_MMU # libgail -> pango -> libglib2
OpenPOWER on IntegriCloud