sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix vector configuration

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2547 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-03-17 01:22:58 +00:00
parent 7ec721de47
commit cd3b35bcb2
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/arm/src/arm/up_head.S
View File

@ -209,34 +209,61 @@ __start:
mcr p15, 0, r0, c3, c0 /* Load domain access register */ mcr p15, 0, r0, c3, c0 /* Load domain access register */
mrc p15, 0, r0, c1, c0 /* Get control register */ mrc p15, 0, r0, c1, c0 /* Get control register */
/* Clear bits (see arm.h) */ /* Clear bits (see arm.h)
*
* CR_R - ROM MMU protection
* CR_F - Implementation defined
* CR_Z - Implementation defined
*
* CR_A - Alignment abort enable
* CR_C - Dcache enable
* CR_W - Write buffer enable
*
* CR_I - Icache enable
*/
bic r0, r0, #(CR_R|CR_F|CR_Z) bic r0, r0, #(CR_R|CR_F|CR_Z)
bic r0, r0, #(CR_A|CR_C|CR_W) bic r0, r0, #(CR_A|CR_C|CR_W)
bic r0, r0, #(CR_I) bic r0, r0, #(CR_I)
/* Set bits (see arm.h) */ /* Set bits (see arm.h)
*
* CR_M - MMU enable
* CR_P - 32-bit exception handler
* CR_D - 32-bit data address range
*/
orr r0, r0, #(CR_M|CR_P|CR_D) orr r0, r0, #(CR_M|CR_P|CR_D)
/* In most architectures, vectors are relocated to 0xffff0000. /* In most architectures, vectors are relocated to 0xffff0000.
* -- but not all * -- but not all
*
* CR_S - System MMU protection
* CR_V - Vectors relocated to 0xffff0000
*/ */
#ifndef CONFIG_ARCH_LOWVECTORS #ifndef CONFIG_ARCH_LOWVECTORS
orr r0, r0, #(CR_S)
#else
orr r0, r0, #(CR_S|CR_V) orr r0, r0, #(CR_S|CR_V)
#else
orr r0, r0, #(CR_S)
#endif #endif
/* CR_RR - Round Robin cache replacement */
#ifdef CPU_CACHE_ROUND_ROBIN #ifdef CPU_CACHE_ROUND_ROBIN
orr r0, r0, #(CR_RR) orr r0, r0, #(CR_RR)
#endif #endif
/* CR_C - Dcache enable */
#ifndef CPU_DCACHE_DISABLE #ifndef CPU_DCACHE_DISABLE
orr r0, r0, #(CR_C) orr r0, r0, #(CR_C)
#endif #endif
/* CR_C - Dcache enable */
#ifndef CPU_ICACHE_DISABLE #ifndef CPU_ICACHE_DISABLE
orr r0, r0, #(CR_I) orr r0, r0, #(CR_I)
#endif #endif
/* CR_A - Alignment abort enable */
#ifdef ALIGNMENT_TRAP #ifdef ALIGNMENT_TRAP
orr r0, r0, #(CR_A) orr r0, r0, #(CR_A)
#endif #endif