From: Tom Rini <trini@konsulko.com>
Date: Tue, 19 Jul 2016 20:38:57 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2016.09-rc1~76
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=66669fcf809c1e3ff644b12e04e625d3737ffd8e;p=u-boot

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
---

66669fcf809c1e3ff644b12e04e625d3737ffd8e
diff --cc arch/arm/cpu/armv8/Makefile
index f6eb9f4a7f,33e6db0cc5..dea14657d9
--- a/arch/arm/cpu/armv8/Makefile
+++ b/arch/arm/cpu/armv8/Makefile
@@@ -15,9 -15,8 +15,11 @@@ obj-y	+= cache.
  obj-y	+= tlb.o
  obj-y	+= transition.o
  obj-y	+= fwcall.o
+ obj-y	+= cpu-dt.o
 +ifndef CONFIG_SPL_BUILD
 +obj-$(CONFIG_ARMV8_SPIN_TABLE) += spin_table.o spin_table_v8.o
 +endif
+ obj-$(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_asm.o
  
  obj-$(CONFIG_FSL_LAYERSCAPE) += fsl-layerscape/
  obj-$(CONFIG_S32V234) += s32v234/
diff --cc arch/arm/lib/bootm-fdt.c
index 2c0b56a8f3,fe5b488339..4481f9e2fa
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@@ -46,13 -45,7 +46,13 @@@ int arch_fixup_fdt(void *blob
  	if (ret)
  		return ret;
  
 +#ifdef CONFIG_ARMV8_SPIN_TABLE
 +	ret = spin_table_update_dt(blob);
 +	if (ret)
 +		return ret;
 +#endif
 +
- #ifdef CONFIG_ARMV7_NONSEC
+ #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
  	ret = psci_update_dt(blob);
  	if (ret)
  		return ret;