projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a common u-boot.lds file across all AT91CAP9/AT91SAM9 platforms
[oweals/u-boot.git]
/
cpu
/
arm926ejs
/
cpu.c
diff --git
a/cpu/arm926ejs/cpu.c
b/cpu/arm926ejs/cpu.c
index 2681f999c1112f7ea6349d7524910f221a37a4e8..722732e589b4d225a3e38aaae3514de4aec3753e 100644
(file)
--- a/
cpu/arm926ejs/cpu.c
+++ b/
cpu/arm926ejs/cpu.c
@@
-33,6
+33,10
@@
#include <command.h>
#include <arm926ejs.h>
#include <command.h>
#include <arm926ejs.h>
+#ifdef CONFIG_USE_IRQ
+DECLARE_GLOBAL_DATA_PTR;
+#endif
+
/* read co-processor 15, register #1 (control register) */
static unsigned long read_p15_c1 (void)
{
/* read co-processor 15, register #1 (control register) */
static unsigned long read_p15_c1 (void)
{
@@
-69,21
+73,21
@@
static void cp_delay (void)
{
volatile int i;
{
volatile int i;
- /*
Many OMAP regs need at least 2 nops
*/
+ /*
copro seems to need some delay between reading and writing
*/
for (i = 0; i < 100; i++);
}
for (i = 0; i < 100; i++);
}
-/* See also ARM
Ref. Man.
*/
+/* See also ARM
926EJ-S Technical Reference Manual
*/
#define C1_MMU (1<<0) /* mmu off/on */
#define C1_ALIGN (1<<1) /* alignment faults off/on */
#define C1_DC (1<<2) /* dcache off/on */
#define C1_MMU (1<<0) /* mmu off/on */
#define C1_ALIGN (1<<1) /* alignment faults off/on */
#define C1_DC (1<<2) /* dcache off/on */
-#define C1_WB (1<<3) /* merging write buffer on/off */
-#define C1_BIG_ENDIAN (1<<7) /* big endian off/on */
+
+#define C1_BIG_ENDIAN (1<<7)
/* big endian off/on */
#define C1_SYS_PROT (1<<8) /* system protection */
#define C1_ROM_PROT (1<<9) /* ROM protection */
#define C1_IC (1<<12) /* icache off/on */
#define C1_SYS_PROT (1<<8) /* system protection */
#define C1_ROM_PROT (1<<9) /* ROM protection */
#define C1_IC (1<<12) /* icache off/on */
-#define C1_HIGH_VECTORS (1<<13) /* location of vectors: low/high addresses */
-#define RESERVED_1 (0xf << 3) /* must be 111b for R/W */
+#define C1_HIGH_VECTORS (1<<13)
/* location of vectors: low/high addresses */
+
int cpu_init (void)
{
int cpu_init (void)
{
@@
-91,8
+95,6
@@
int cpu_init (void)
* setup up stacks if necessary
*/
#ifdef CONFIG_USE_IRQ
* setup up stacks if necessary
*/
#ifdef CONFIG_USE_IRQ
- DECLARE_GLOBAL_DATA_PTR;
-
IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
#endif
IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4;
FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
#endif
@@
-120,6
+122,7
@@
int cleanup_before_linux (void)
/* flush I/D-cache */
i = 0;
asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));
/* flush I/D-cache */
i = 0;
asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));
+
return (0);
}
return (0);
}