[U-Boot] ARM: bootm: do not add PSCI to fdt when booting in secure mode.

[Tom Rini]

On Sun, Dec 21, 2014 at 09:45:11AM +0000, Ian Campbell wrote:

> Commit 8bc347e2ec17 "ARM: bootm: Allow booting in secure mode on hyp capable
> systems" added the capability to select nonsec vs sec mode boot via an
> environment var.
> 
> There is a subtle gotcha with this functionality, which is that the PSCI nodes
> are still created in the fdt (via armv7_update_dt->fdt_psci) even when booting
> in secure mode. Which means that if the kernel is PSCI aware then it will fail
> to boot because it will try and do PSCI from secure world, which won't work.
> 
> This likely didn't get noticed before because the original purpose was to
> support booting the legacy linux-sunxi kernels which don't understand PSCI.
> 
> To fix expose boot_nonsec (renaming with armv7_ prefix) outside of bootm.c and
> use from the virt-dt code.
> 
> As well as avoiding the creation of the PSCI nodes we should also avoid
> reserving the secure RAM, so do so.
> 
> Signed-off-by: Ian Campbell <ijc at hellion.org.uk>
> Cc: Hans de Goede <hdegoede at redhat.com>
> Cc: Albert ARIBAUD <albert.u.boot at aribaud.net>
> Cc: Tom Rini <trini at ti.com>
> Acked-by: Hans de Goede <hdegoede at redhat.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150107/161f547a/attachment.pgp>