andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #167 from jcastillo-arm/jc/tf-issues/217 

FVP: Ensure system reset wake-up results in cold boot
This commit is contained in:
Dan Handley 2014-07-25 14:57:54 +01:00
parent 54d0911f64 08783e4326
commit 2d4aceaffa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plat/fvp/aarch64/fvp_helpers.S
View File

@ -122,8 +122,11 @@ func platform_get_entrypoint
str w2, [x1, #PSYSR_OFF]
ldr w2, [x1, #PSYSR_OFF]
ubfx w2, w2, #PSYSR_WK_SHIFT, #PSYSR_WK_MASK
cbnz w2, warm_reset
mov x0, x2
cmp w2, #WKUP_PPONR
beq warm_reset
cmp w2, #WKUP_GICREQ
beq warm_reset
mov x0, #0
b exit
warm_reset:
/* ---------------------------------------------