| commit | 19adcb415c313d656324d54e7608cdc7d7a5c414 | [log] [tgz] |
|---|---|---|
| author | Paul Beesley <paul.beesley@arm.com> | Tue Oct 15 14:05:28 2019 +0000 |
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | Tue Oct 15 14:05:28 2019 +0000 |
| tree | f850ae492465fe2e1222f4d29ef8c3f68725874d | |
| parent | a05c8f873134be55754f67d56b2062b97274cbc5 [diff] | |
| parent | 38d5e150edc82570e1a3e9dc2e95dce96e6fd94e [diff] |
Merge "Correct UART PL011 initialization calculation" into integration
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index e1e346c..05c8250 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S
@@ -57,7 +57,7 @@ #if (ARM_ARCH_MAJOR == 7) && !defined(ARMV7_SUPPORTS_VIRTUALIZATION) push {r0,r3} softudiv r0,r1,r2,r3 - mov r1, r0 + mov r2, r0 pop {r0,r3} #else udiv r2, r1, r2