Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 13:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
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] str w2, [x1, #PSYSR_OFF]
ldr w2, [x1, #PSYSR_OFF] ldr w2, [x1, #PSYSR_OFF]
ubfx w2, w2, #PSYSR_WK_SHIFT, #PSYSR_WK_MASK ubfx w2, w2, #PSYSR_WK_SHIFT, #PSYSR_WK_MASK
cbnz w2, warm_reset cmp w2, #WKUP_PPONR
mov x0, x2 beq warm_reset
cmp w2, #WKUP_GICREQ
beq warm_reset
mov x0, #0
b exit b exit
warm_reset: warm_reset:
/* --------------------------------------------- /* ---------------------------------------------