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

diff --cc README
Simple merge

diff --cc arch/arm/cpu/armv8/Makefile
index f6eb9f4a7fb4be2cd51d4bf08b5f6c65adf78868,33e6db0cc5246b740f7e4d36fcc814f422570182..dea14657d9aef4ff3ef974cbceb75dd061536107
--- 1/arch/arm/cpu/armv8/Makefile
--- 2/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/include/asm/psci.h
Simple merge

diff --cc arch/arm/lib/bootm-fdt.c
index 2c0b56a8f36f480349c5cdaded168c217220c51a,fe5b4883391d6d26f6ed3368d3e57f55652ded49..4481f9e2fa9ceb26f2f54f21e67f6b825c016601
--- 1/arch/arm/lib/bootm-fdt.c
--- 2/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_ARMV7_NONSEC
 +#ifdef CONFIG_ARMV8_SPIN_TABLE
 +      ret = spin_table_update_dt(blob);
 +      if (ret)
 +              return ret;
 +#endif
 +
+ #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
        ret = psci_update_dt(blob);
        if (ret)
                return ret;

diff --cc arch/arm/mach-sunxi/board.c
Simple merge

diff --cc common/board_f.c
Simple merge