diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-06-20 10:21:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 10:21:38 +0100 |
| commit | 3465ab602a24f6932ca7b30e849de82fa770d986 (patch) | |
| tree | 85e52a8d1e8a14aaca72c326c237fb80a409eeaa /plat/hisilicon | |
| parent | 6de8b24f52cf2bd74adefbaa86dd2a0676c3eaa2 (diff) | |
| parent | 0d5eb656f7a01facec2313c7a7aa0b108b6a7579 (diff) | |
Merge pull request #991 from davidcunado-arm/dc/update_hikey
hikey960: migrate to use A53 specific defines
Diffstat (limited to 'plat/hisilicon')
| -rw-r--r-- | plat/hisilicon/hikey960/aarch64/hikey960_helpers.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S b/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S index 2e24416d..c88f68ee 100644 --- a/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S +++ b/plat/hisilicon/hikey960/aarch64/hikey960_helpers.S @@ -144,10 +144,10 @@ endfunc plat_reset_handler * ----------------------------------------------------- */ func set_retention_ticks - mrs x0, CPUECTLR_EL1 - bic x0, x0, #CPUECTLR_CPU_RET_CTRL_MASK + mrs x0, CORTEX_A53_ECTLR_EL1 + bic x0, x0, #CORTEX_A53_ECTLR_CPU_RET_CTRL_MASK orr x0, x0, #RETENTION_ENTRY_TICKS_8 - msr CPUECTLR_EL1, x0 + msr CORTEX_A53_ECTLR_EL1, x0 isb dsb sy ret @@ -159,9 +159,9 @@ endfunc set_retention_ticks * ----------------------------------------------------- */ func clr_retention_ticks - mrs x0, CPUECTLR_EL1 - bic x0, x0, #CPUECTLR_CPU_RET_CTRL_MASK - msr CPUECTLR_EL1, x0 + mrs x0, CORTEX_A53_ECTLR_EL1 + bic x0, x0, #CORTEX_A53_ECTLR_CPU_RET_CTRL_MASK + msr CORTEX_A53_ECTLR_EL1, x0 isb dsb sy ret |