Commit 8cda413b9b13e4bbb636d2d6151da9902de35fa2
Committed by
Tom Rini
Tom Rini
1 parent
b1de434e23
Exists in
v2017.01-smarct4x
and in
37 other branches
Nokia RX-51: Do not call secure PPA routine on non secure devices
Since commit 41623c91b09a0c865fab41acdaff30f060f29ad6 u-boot running in qemu is crashing in function do_omap3_emu_romcode_call(). RX-51 board uses this function for Cortex-A8 errata 430973 workaround (Set IBE bit in ACR) which is needed only on real secure device and not in qemu. This board patch just disable calling secure PPA routine on non secure devices. Qemu implements GP device and with this patch u-boot is working in qemu again. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz>
Showing 1 changed file with 5 additions and 1 deletions Side-by-side Diff
board/nokia/rx51/rx51.c
| ... | ... | @@ -422,8 +422,12 @@ |
| 422 | 422 | /* |
| 423 | 423 | * Cortex-A8(r1p0..r1p2) errata 430973 workaround |
| 424 | 424 | * Set IBE bit in Auxiliary Control Register |
| 425 | + * | |
| 426 | + * Call this routine only on real secure device | |
| 427 | + * Qemu does not implement secure PPA and crash | |
| 425 | 428 | */ |
| 426 | - omap3_update_aux_cr_secure_rx51(1 << 6, 0); | |
| 429 | + if (get_device_type() == HS_DEVICE) | |
| 430 | + omap3_update_aux_cr_secure_rx51(1 << 6, 0); | |
| 427 | 431 | |
| 428 | 432 | return 0; |
| 429 | 433 | } |