summaryrefslogtreecommitdiffstats
path: root/board/nokia
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2015-01-08 10:11:40 +0100
committerTom Rini <trini@ti.com>2015-01-12 09:38:47 -0500
commit8cda413b9b13e4bbb636d2d6151da9902de35fa2 (patch)
tree4e95deb404438fdcd3c71bee86748be2144feb9b /board/nokia
parentb1de434e2371b2cc6ad0117c8af2d767b7e3028b (diff)
downloadblackbird-obmc-uboot-8cda413b9b13e4bbb636d2d6151da9902de35fa2.tar.gz
blackbird-obmc-uboot-8cda413b9b13e4bbb636d2d6151da9902de35fa2.zip
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>
Diffstat (limited to 'board/nokia')
-rw-r--r--board/nokia/rx51/rx51.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index b6b8ad6c48..08fcaf21b3 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -422,8 +422,12 @@ int misc_init_r(void)
/*
* Cortex-A8(r1p0..r1p2) errata 430973 workaround
* Set IBE bit in Auxiliary Control Register
+ *
+ * Call this routine only on real secure device
+ * Qemu does not implement secure PPA and crash
*/
- omap3_update_aux_cr_secure_rx51(1 << 6, 0);
+ if (get_device_type() == HS_DEVICE)
+ omap3_update_aux_cr_secure_rx51(1 << 6, 0);
return 0;
}
OpenPOWER on IntegriCloud