Merge branch 'master' into developer
Conflicts: source/start.s
This commit is contained in:
commit
4d48238fb1
@ -77,8 +77,9 @@ start:
|
|||||||
mcr p15, 0, r8, c2, c0, 0 @ Data cacheable 0, 2, 4
|
mcr p15, 0, r8, c2, c0, 0 @ Data cacheable 0, 2, 4
|
||||||
mcr p15, 0, r8, c2, c0, 1 @ Inst cacheable 0, 2, 4
|
mcr p15, 0, r8, c2, c0, 1 @ Inst cacheable 0, 2, 4
|
||||||
|
|
||||||
@ Enable caches / MPU
|
@ Enable caches / MPU / ITCM
|
||||||
mrc p15, 0, r0, c1, c0, 0 @ read control register
|
mrc p15, 0, r0, c1, c0, 0 @ read control register
|
||||||
|
orr r0, r0, #(1<<18) @ - ITCM enable
|
||||||
orr r0, r0, #(1<<13) @ - alternate exception vectors enable
|
orr r0, r0, #(1<<13) @ - alternate exception vectors enable
|
||||||
orr r0, r0, #(1<<12) @ - instruction cache enable
|
orr r0, r0, #(1<<12) @ - instruction cache enable
|
||||||
orr r0, r0, #(1<<2) @ - data cache enable
|
orr r0, r0, #(1<<2) @ - data cache enable
|
||||||
|
Reference in New Issue
Block a user