aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-06-25 06:31:22 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-25 06:31:22 -0400
commit800d8b5c4b322798414100c253524aaf1bb9cb86 (patch)
tree19b90bd9a0feb1f0bc4789749e4afdd6e27dd9c9
parent1b93a71755f2b15450b3e3045dab58a633e37b18 (diff)
[ARM] Remove partial non-v6 binutils compatibility
proc-v6 contains some compatibility to be able to use the V6 "cps" instruction. However, the kernel makes use of this instruction elsewhere extensively, so there's no point keeping this compatibility anymore. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/proc-v6.S32
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index ee6f15298735..09b1a41a6de8 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -29,38 +29,6 @@
29#define TTB_RGN_WT (2 << 3) 29#define TTB_RGN_WT (2 << 3)
30#define TTB_RGN_WB (3 << 3) 30#define TTB_RGN_WB (3 << 3)
31 31
32 .macro cpsie, flags
33 .ifc \flags, f
34 .long 0xf1080040
35 .exitm
36 .endif
37 .ifc \flags, i
38 .long 0xf1080080
39 .exitm
40 .endif
41 .ifc \flags, if
42 .long 0xf10800c0
43 .exitm
44 .endif
45 .err
46 .endm
47
48 .macro cpsid, flags
49 .ifc \flags, f
50 .long 0xf10c0040
51 .exitm
52 .endif
53 .ifc \flags, i
54 .long 0xf10c0080
55 .exitm
56 .endif
57 .ifc \flags, if
58 .long 0xf10c00c0
59 .exitm
60 .endif
61 .err
62 .endm
63
64ENTRY(cpu_v6_proc_init) 32ENTRY(cpu_v6_proc_init)
65 mov pc, lr 33 mov pc, lr
66 34