summaryrefslogtreecommitdiff
path: root/cpu/arm926ejs/cpu.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-04-05 13:02:43 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-04-05 13:02:43 +0200
commit677e62f43235de9a1701204d7bcea0fb3d233fa1 (patch)
tree39cfac114059b9e3f8b4c949da614b0475fff890 /cpu/arm926ejs/cpu.c
parent36003268968949110ef145d9f2eaf8439c96d25b (diff)
downloadu-boot-imx-677e62f43235de9a1701204d7bcea0fb3d233fa1.zip
u-boot-imx-677e62f43235de9a1701204d7bcea0fb3d233fa1.tar.gz
u-boot-imx-677e62f43235de9a1701204d7bcea0fb3d233fa1.tar.bz2
arm: update co-processor 15 access
import system.h from linux Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'cpu/arm926ejs/cpu.c')
-rw-r--r--cpu/arm926ejs/cpu.c71
1 files changed, 14 insertions, 57 deletions
diff --git a/cpu/arm926ejs/cpu.c b/cpu/arm926ejs/cpu.c
index 48a2c0b..d1748c9 100644
--- a/cpu/arm926ejs/cpu.c
+++ b/cpu/arm926ejs/cpu.c
@@ -32,43 +32,12 @@
#include <common.h>
#include <command.h>
#include <arm926ejs.h>
+#include <asm/system.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)
-{
- unsigned long value;
-
- __asm__ __volatile__(
- "mrc p15, 0, %0, c1, c0, 0 @ read control reg\n"
- : "=r" (value)
- :
- : "memory");
-
-#ifdef MMU_DEBUG
- printf ("p15/c1 is = %08lx\n", value);
-#endif
- return value;
-}
-
-/* write to co-processor 15, register #1 (control register) */
-static void write_p15_c1 (unsigned long value)
-{
-#ifdef MMU_DEBUG
- printf ("write %08lx to p15/c1\n", value);
-#endif
- __asm__ __volatile__(
- "mcr p15, 0, %0, c1, c0, 0 @ write it back\n"
- :
- : "r" (value)
- : "memory");
-
- read_p15_c1 ();
-}
-
static void cp_delay (void)
{
volatile int i;
@@ -77,18 +46,6 @@ static void cp_delay (void)
for (i = 0; i < 100; i++);
}
-/* See also ARM926EJ-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_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_HIGH_VECTORS (1<<13) /* location of vectors: low/high addresses */
-
-
int cpu_init (void)
{
/*
@@ -116,7 +73,7 @@ int cleanup_before_linux (void)
/* turn off I/D-cache */
asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
- i &= ~(C1_DC | C1_IC);
+ i &= ~(CR_C | CR_I);
asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
/* flush I/D-cache */
@@ -134,52 +91,52 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return (0);
}
-/* cache_bit must be either C1_IC or C1_DC */
+/* cache_bit must be either CR_I or CR_C */
static void cache_enable(uint32_t cache_bit)
{
uint32_t reg;
- reg = read_p15_c1(); /* get control reg. */
+ reg = get_cr(); /* get control reg. */
cp_delay();
- write_p15_c1(reg | cache_bit);
+ set_cr(reg | cache_bit);
}
-/* cache_bit must be either C1_IC or C1_DC */
+/* cache_bit must be either CR_I or CR_C */
static void cache_disable(uint32_t cache_bit)
{
uint32_t reg;
- reg = read_p15_c1();
+ reg = get_cr();
cp_delay();
- write_p15_c1(reg & ~cache_bit);
+ set_cr(reg & ~cache_bit);
}
void icache_enable(void)
{
- cache_enable(C1_IC);
+ cache_enable(CR_I);
}
void icache_disable(void)
{
- cache_disable(C1_IC);
+ cache_disable(CR_I);
}
int icache_status(void)
{
- return (read_p15_c1() & C1_IC) != 0;
+ return (get_cr() & CR_I) != 0;
}
void dcache_enable(void)
{
- cache_enable(C1_DC);
+ cache_enable(CR_C);
}
void dcache_disable(void)
{
- cache_disable(C1_DC);
+ cache_disable(CR_C);
}
int dcache_status(void)
{
- return (read_p15_c1() & C1_DC) != 0;
+ return (get_cr() & CR_C) != 0;
}