Merge git://git.denx.de/u-boot-fsl-qoriq

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index acd689beccc76ca09604b2281a4f3742e9df98e2,49bc9d83756c645bbe10d55f5340ebb8712455a4..e6263c05359080fd8d492f3251db68f7e31ea473
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -126,11 -126,12 +126,17 @@@ config ENABLE_ARM_SOC_BOOT0_HOO
          ARM_SOC_BOOT0_HOOK which contains the required assembler
          preprocessor code.
  
 +config ARCH_OMAP2
 +      bool
 +      select CPU_V7
 +      select SUPPORT_SPL
 +
+ config ARM64_SUPPORT_AARCH32
+       bool "ARM64 system support AArch32 execution state"
+       default y if ARM64 && !TARGET_THUNDERX_88XX
+       help
+         This ARM64 system supports AArch32 execution state.
+ 
  choice
        prompt "Target select"
        default TARGET_HIKEY