Commit d60489a6 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent ad0e217b

arch/Config.in.arm

+0 −4
Original line number Diff line number Diff line
@@ -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

package/nettle/nettle.mk

+1 −1
Original line number Diff line number Diff line
@@ -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