diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-19 17:22:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-19 17:22:23 (GMT) |
| commit | 0675f992dbf4a785a05a1baf149c2bce6aa5fe90 (patch) | |
| tree | b8868ec70ff6b2b20f8f0fb87df9438906020a08 /arch/arm/mach-rmobile/lowlevel_init_gen3.S | |
| parent | 755b06d1c0f3b16318c7580bec066efbb9ec6ccf (diff) | |
| parent | 5e4a6db8f428cb1f8ced74bc77241144ac0c5b1a (diff) | |
| download | u-boot-0675f992dbf4a785a05a1baf149c2bce6aa5fe90.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/mach-rmobile/lowlevel_init_gen3.S')
| -rw-r--r-- | arch/arm/mach-rmobile/lowlevel_init_gen3.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-rmobile/lowlevel_init_gen3.S b/arch/arm/mach-rmobile/lowlevel_init_gen3.S index 11acce0..ce3d4f5 100644 --- a/arch/arm/mach-rmobile/lowlevel_init_gen3.S +++ b/arch/arm/mach-rmobile/lowlevel_init_gen3.S @@ -61,14 +61,14 @@ ENTRY(lowlevel_init) /* * All slaves will enter EL2 and optionally EL1. */ - adr x3, lowlevel_in_el2 - ldr x4, =ES_TO_AARCH64 + adr x4, lowlevel_in_el2 + ldr x5, =ES_TO_AARCH64 bl armv8_switch_to_el2 lowlevel_in_el2: #ifdef CONFIG_ARMV8_SWITCH_TO_EL1 - adr x3, lowlevel_in_el1 - ldr x4, =ES_TO_AARCH64 + adr x4, lowlevel_in_el1 + ldr x5, =ES_TO_AARCH64 bl armv8_switch_to_el1 lowlevel_in_el1: |