diff options
author | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
commit | 66669fcf809c1e3ff644b12e04e625d3737ffd8e (patch) | |
tree | 362111f12b9dcf33eb31e165d882957df45fc896 /arch/arm/cpu/armv8/cpu-dt.c | |
parent | f60d0603edca472c4458b30956f38c6c1a836d66 (diff) | |
parent | 0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d (diff) | |
download | u-boot-66669fcf809c1e3ff644b12e04e625d3737ffd8e.tar.gz u-boot-66669fcf809c1e3ff644b12e04e625d3737ffd8e.tar.xz u-boot-66669fcf809c1e3ff644b12e04e625d3737ffd8e.zip |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/cpu/armv8/Makefile
arch/arm/lib/bootm-fdt.c
Diffstat (limited to 'arch/arm/cpu/armv8/cpu-dt.c')
-rw-r--r-- | arch/arm/cpu/armv8/cpu-dt.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c new file mode 100644 index 0000000000..9ffb49c37c --- /dev/null +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -0,0 +1,31 @@ +/* + * Copyright 2016 NXP Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/psci.h> +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT +#include <asm/armv8/sec_firmware.h> +#endif + +int psci_update_dt(void *fdt) +{ +#ifdef CONFIG_MP +#if defined(CONFIG_ARMV8_PSCI) +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT + /* + * If the PSCI in SEC Firmware didn't work, avoid to update the + * device node of PSCI. But still return 0 instead of an error + * number to support detecting PSCI dynamically and then switching + * the SMP boot method between PSCI and spin-table. + */ + if (sec_firmware_support_psci_version() == 0xffffffff) + return 0; +#endif + fdt_psci(fdt); +#endif +#endif + return 0; +} |