git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
boot
/
compressed
/
head-clps7500.S
diff --git
a/arch/arm/boot/compressed/head-clps7500.S
b/arch/arm/boot/compressed/head-clps7500.S
index
a1a0c84
..
4f3c78a
100644
(file)
--- a/
arch/arm/boot/compressed/head-clps7500.S
+++ b/
arch/arm/boot/compressed/head-clps7500.S
@@
-1,10
+1,9
@@
/*
/*
- * linux/arch/arm/boot/compressed/head.S
+ * linux/arch/arm/boot/compressed/head
-clps7500
.S
*
* Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd
*/
*
* Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd
*/
-#include <linux/config.h>
/* There are three different ways the kernel can be
booted on a 7500 system: from Angel (loaded in RAM), from
/* There are three different ways the kernel can be
booted on a 7500 system: from Angel (loaded in RAM), from
@@
-34,7
+33,7
@@
mov r0, #0x30
mcr p15, 0, r0, c1, c0, 0
mov r0, #0x13
mov r0, #0x30
mcr p15, 0, r0, c1, c0, 0
mov r0, #0x13
- msr cpsr, r0
+ msr cpsr
_cxsf
, r0
mov r12, #0x03000000 @ point to LEDs
orr r12, r12, #0x00020000
orr r12, r12, #0xba00
mov r12, #0x03000000 @ point to LEDs
orr r12, r12, #0x00020000
orr r12, r12, #0xba00
@@
-71,7
+70,7
@@
/* Ensure all interrupts are off and MMU disabled */
mrs r0, cpsr
orr r0, r0, #0xc0
/* Ensure all interrupts are off and MMU disabled */
mrs r0, cpsr
orr r0, r0, #0xc0
- msr cpsr, r0
+ msr cpsr
_cxsf
, r0
adr lr, 1b
orr lr, lr, #0x10000000
adr lr, 1b
orr lr, lr, #0x10000000