aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarc Zyngier <Marc.Zyngier@arm.com>2013-06-21 09:49:43 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-24 10:28:24 -0400
commit52c08a9e399739979027ea1e463f5529476da104 (patch)
tree3d01efd310b9ea5614e91555a259e2b4ec6e44dd /arch
parent0d0752bca1f9a91fb646647aa4abbb21156f316c (diff)
ARM: 7770/1: remove residual ARMv2 support from decompressor
arm26 support in Linux is long gone, yet it left an interresting, fossilized trace in the decompressor. Remove it so people won't get confused about what teqp is actually doing here... Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/compressed/head.S5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 8e0d0ada62df..15f2f573d480 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -141,7 +141,6 @@ start:
141 mov r7, r1 @ save architecture ID 141 mov r7, r1 @ save architecture ID
142 mov r8, r2 @ save atags pointer 142 mov r8, r2 @ save atags pointer
143 143
144#ifndef __ARM_ARCH_2__
145 /* 144 /*
146 * Booting from Angel - need to enter SVC mode and disable 145 * Booting from Angel - need to enter SVC mode and disable
147 * FIQs/IRQs (numeric definitions from angel arm.h source). 146 * FIQs/IRQs (numeric definitions from angel arm.h source).
@@ -157,10 +156,6 @@ not_angel:
157 safe_svcmode_maskall r0 156 safe_svcmode_maskall r0
158 msr spsr_cxsf, r9 @ Save the CPU boot mode in 157 msr spsr_cxsf, r9 @ Save the CPU boot mode in
159 @ SPSR 158 @ SPSR
160#else
161 teqp pc, #0x0c000003 @ turn off interrupts
162#endif
163
164 /* 159 /*
165 * Note that some cache flushing and other stuff may 160 * Note that some cache flushing and other stuff may
166 * be needed here - is there an Angel SWI call for this? 161 * be needed here - is there an Angel SWI call for this?