From: Tom Rini <trini@konsulko.com>
Date: Fri, 25 Nov 2016 22:39:54 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2017.01-rc1~212
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed77ccd014b4073c4d282028cfb22f8d1742fec1;p=oweals%2Fu-boot.git

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

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	arch/arm/Kconfig
---

ed77ccd014b4073c4d282028cfb22f8d1742fec1
diff --cc arch/arm/Kconfig
index acd689becc,49bc9d8375..e6263c0535
--- a/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