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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc include/configs/ls1012a_common.h
Simple merge

diff --cc include/configs/ls1021aqds.h
Simple merge

diff --cc include/configs/ls1021atwr.h
Simple merge

diff --cc include/configs/ls1043a_common.h
Simple merge

diff --cc include/configs/ls1046a_common.h
index 1fbafaa9c24c710cf8ef66ea1f66fbc9f5d02330,47a544c90c5f0b0f86a809f7621aa039c2d7d22a..b66b8ac72c2369ce636fb2a60e1874c2c1761b5f
--- 1/include/configs/ls1046a_common.h
--- 2/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@@ -138,7 -138,20 +138,17 @@@
  #define CONFIG_SYS_I2C_MXC_I2C3
  #define CONFIG_SYS_I2C_MXC_I2C4
  
+ /* PCIe */
+ #define CONFIG_PCIE1          /* PCIE controller 1 */
+ #define CONFIG_PCIE2          /* PCIE controller 2 */
+ #define CONFIG_PCIE3          /* PCIE controller 3 */
+ 
+ #ifdef CONFIG_PCI
+ #define CONFIG_PCI_SCAN_SHOW
+ #define CONFIG_CMD_PCI
+ #endif
+ 
  /* Command line configuration */
 -#ifndef SPL_NO_ENV
 -#define CONFIG_CMD_ENV
 -#endif
  
  /* MMC */
  #ifndef SPL_NO_MMC

diff --cc include/configs/ls2080a_common.h
Simple merge

diff --cc include/configs/ls2080aqds.h
Simple merge

diff --cc include/configs/ls2080ardb.h
Simple merge