diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-07-25 14:57:54 +0100 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-07-25 14:57:54 +0100 |
| commit | 2d4aceaffa2e6e6330fbfcb52399ba18fbf20929 (patch) | |
| tree | b323fd24a0e6ea016e8b88be2b802e543780dcd6 /plat | |
| parent | 54d0911f643820350e52b97c494938e4f5ff2dd0 (diff) | |
| parent | 08783e4326bdbc86e52f575001c35de260a93f78 (diff) | |
Merge pull request #167 from jcastillo-arm/jc/tf-issues/217
FVP: Ensure system reset wake-up results in cold boot
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/fvp/aarch64/fvp_helpers.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plat/fvp/aarch64/fvp_helpers.S b/plat/fvp/aarch64/fvp_helpers.S index f856f46..3cd0b46 100644 --- a/plat/fvp/aarch64/fvp_helpers.S +++ b/plat/fvp/aarch64/fvp_helpers.S @@ -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: /* --------------------------------------------- |