diff --git a/arch/Config.in.arm b/arch/Config.in.arm index b7a9ed60a..4cc41f10a 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 fae558abf..f8c152651 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 6534f9310..f18ab1821 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 121f2ee4c..7a0182e45 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 be7e0f0be..4f5404ce4 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 pango -> libglib2