arch: remove BR2_arm10t

The BR2_arm10t option is not correct as it references an ARM family,
while other options indicate a specific ARM core. The ARM cores in
ARM10 family are ARM1020E, ARM1022E and ARM1026EJ-S according to
Wikipedia. However, those are clearly very rare, and Wikipedia only
indicates two Conexant ADSL-related SoC as being part of this family
of ARM cores. Therefore, this commit removes this ARM family.

[Peter: remove nettle.mk reference as pointed out by Yann]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index 5ae2378fed719b7e8f865c572e3393b93acab99f..201ff1df20b6f01091ff3103c285264424f9665c 100644 (file)
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -54,9 +54,6 @@ config BR2_arm926t
        bool "arm926t"
        select BR2_ARM_CPU_MAYBE_HAS_VFPV2
        select BR2_ARM_CPU_HAS_THUMB
-config BR2_arm10t
-       bool "arm10t"
-       select BR2_ARM_CPU_HAS_THUMB
 config BR2_arm1136jf_s_r0
        bool "arm1136jf_s rev0"
        select BR2_ARM_CPU_HAS_VFPV2
@@ -367,7 +364,6 @@ config BR2_GCC_TARGET_ARCH
        default "armv4t"        if BR2_arm920t
        default "armv4t"        if BR2_arm922t
        default "armv5te"       if BR2_arm926t
-       default "armv5t"        if BR2_arm10t
        default "armv6j"        if BR2_arm1136jf_s_r0
        default "armv6k"        if BR2_arm1136jf_s_r1
        default "armv6zk"       if BR2_arm1176jz_s

diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index 647100a443918b978ab9c5074f3cb542fd8587f9..519af69563fb66a159ef6240e225c500452067b9 100644 (file)
--- 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_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_arm10t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)
+ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)
 NETTLE_CONF_OPT += --disable-assembler
 endif