diff options
| author | BernardXiong <[email protected]> | 2015-05-18 18:16:59 +0800 |
|---|---|---|
| committer | BernardXiong <[email protected]> | 2015-05-18 18:16:59 +0800 |
| commit | 7d73fb8bdbca622142e9802dc7a9a495563638f0 (patch) | |
| tree | b9e96572c375829c2029ec6605e835b76569a5ad /libcpu | |
| parent | 8de629c0b0408e2bd45f985cbca58bb99cf2f1bf (diff) | |
| parent | 0d1ee90f2815bded610dd96d9a07701b4f83a797 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/arm/am335x/mmu.c | 2 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m0/context_rvds.S | 4 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m3/context_rvds.S | 6 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m4/context_rvds.S | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/libcpu/arm/am335x/mmu.c b/libcpu/arm/am335x/mmu.c index 46f2d6afd7..d3e505e76a 100644 --- a/libcpu/arm/am335x/mmu.c +++ b/libcpu/arm/am335x/mmu.c @@ -15,7 +15,7 @@ #include <rtthread.h> #include "am33xx.h" -#define DESC_SEC (0x2|(1<<4)) +#define DESC_SEC (0x2) #define CB (3<<2) //cache_on, write_back #define CNB (2<<2) //cache_on, write_through #define NCB (1<<2) //cache_off,WR_BUF on diff --git a/libcpu/arm/cortex-m0/context_rvds.S b/libcpu/arm/cortex-m0/context_rvds.S index 89ac029282..bf68592e63 100644 --- a/libcpu/arm/cortex-m0/context_rvds.S +++ b/libcpu/arm/cortex-m0/context_rvds.S @@ -183,13 +183,11 @@ rt_hw_context_switch_to PROC LDR r0, =NVIC_INT_CTRL LDR r1, =NVIC_PENDSVSET STR r1, [r0] - NOP ; restore MSP LDR r0, =SCB_VTOR LDR r0, [r0] LDR r0, [r0] - NOP MSR msp, r0 ; enable interrupts at processor level @@ -216,4 +214,6 @@ HardFault_Handler PROC POP {pc} ENDP + ALIGN 4 + END diff --git a/libcpu/arm/cortex-m3/context_rvds.S b/libcpu/arm/cortex-m3/context_rvds.S index 33fcd124d9..ebfd5c8da8 100644 --- a/libcpu/arm/cortex-m3/context_rvds.S +++ b/libcpu/arm/cortex-m3/context_rvds.S @@ -177,7 +177,6 @@ rt_hw_context_switch_to PROC rt_hw_interrupt_thread_switch PROC EXPORT rt_hw_interrupt_thread_switch BX lr - NOP ENDP IMPORT rt_hw_hard_fault_exception @@ -203,5 +202,6 @@ HardFault_Handler PROC BX lr ENDP - NOP - END
\ No newline at end of file + ALIGN 4 + + END diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S index af7461fd49..d7cb34d5c3 100644 --- a/libcpu/arm/cortex-m4/context_rvds.S +++ b/libcpu/arm/cortex-m4/context_rvds.S @@ -218,7 +218,6 @@ rt_hw_context_switch_to PROC rt_hw_interrupt_thread_switch PROC EXPORT rt_hw_interrupt_thread_switch BX lr - NOP ENDP IMPORT rt_hw_hard_fault_exception @@ -235,4 +234,6 @@ HardFault_Handler PROC BX lr ENDP + ALIGN 4 + END |