Commit 357c9c1f authored by Russell King's avatar Russell King
Browse files

ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs 



This patch removes support for ARMv3 CPUs, which haven't worked properly
for quite some time (see the FIXME comment in arch/arm/mm/fault.c).  The
only V3 parts left is the cache model for ARMv3, which is needed for some
odd reason by ARM740T CPUs, and being able to build with -march=armv3,
which is required for the RiscPC platform due to its bus structure.

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 69964ea4

arch/arm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 
arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3



# This selects how we optimise for the processor.

tune-$(CONFIG_CPU_ARM610)	:=-mtune=arm610

tune-$(CONFIG_CPU_ARM710)	:=-mtune=arm710

tune-$(CONFIG_CPU_ARM7TDMI)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM720T)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM740T)	:=-mtune=arm7tdmi

arch/arm/configs/rpc_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_RPC=y

CONFIG_CPU_ARM610=y

CONFIG_CPU_ARM710=y

CONFIG_CPU_SA110=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/include/asm/glue-df.h

+0 −8
Original line number Diff line number Diff line
@@ -31,14 +31,6 @@ 
#undef CPU_DABORT_HANDLER

#undef MULTI_DABORT



#if defined(CONFIG_CPU_ARM610)

# ifdef CPU_DABORT_HANDLER

#  define MULTI_DABORT 1

# else

#  define CPU_DABORT_HANDLER cpu_arm6_data_abort

# endif

#endif



#if defined(CONFIG_CPU_ARM710)

# ifdef CPU_DABORT_HANDLER

#  define MULTI_DABORT 1

arch/arm/include/asm/glue-proc.h

+0 −18
Original line number Diff line number Diff line
@@ -23,15 +23,6 @@ 
 * CPU_NAME - the prefix for CPU related functions

 */



#ifdef CONFIG_CPU_ARM610

# ifdef CPU_NAME

#  undef  MULTI_CPU

#  define MULTI_CPU

# else

#  define CPU_NAME cpu_arm6

# endif

#endif



#ifdef CONFIG_CPU_ARM7TDMI

# ifdef CPU_NAME

#  undef  MULTI_CPU
@@ -41,15 +32,6 @@ 
# endif

#endif



#ifdef CONFIG_CPU_ARM710

# ifdef CPU_NAME

#  undef  MULTI_CPU

#  define MULTI_CPU

# else

#  define CPU_NAME cpu_arm7

# endif

#endif



#ifdef CONFIG_CPU_ARM720T

# ifdef CPU_NAME

#  undef  MULTI_CPU

arch/arm/include/asm/page.h

+0 −9
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
 *	processor(s) we're building for.

 *

 *	We have the following to choose from:

 *	  v3		- ARMv3

 *	  v4wt		- ARMv4 with writethrough cache, without minicache

 *	  v4wb		- ARMv4 with writeback cache, without minicache

 *	  v4_mc		- ARMv4 with minicache
@@ -44,14 +43,6 @@ 
#undef _USER

#undef MULTI_USER



#ifdef CONFIG_CPU_COPY_V3

# ifdef _USER

#  define MULTI_USER 1

# else

#  define _USER v3

# endif

#endif



#ifdef CONFIG_CPU_COPY_V4WT

# ifdef _USER

#  define MULTI_USER 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE