projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
virt-dt.c
diff --git
a/arch/arm/cpu/armv7/virt-dt.c
b/arch/arm/cpu/armv7/virt-dt.c
index 0b0d6a76fcc72bfcb2197369fdf985db6b390126..ad19e4c47c2e9947358c1cbcbcd24a5370e94436 100644
(file)
--- a/
arch/arm/cpu/armv7/virt-dt.c
+++ b/
arch/arm/cpu/armv7/virt-dt.c
@@
-90,6
+90,8
@@
static int fdt_psci(void *fdt)
int armv7_update_dt(void *fdt)
{
+ if (!armv7_boot_nonsec())
+ return 0;
#ifndef CONFIG_ARMV7_SECURE_BASE
/* secure code lives in RAM, keep it alive */
fdt_add_mem_rsv(fdt, (unsigned long)__secure_start,