From: Tom Rini <trini@konsulko.com>
Date: Fri, 26 May 2017 15:19:27 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2017.07-rc1~189
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=380e86f361e4e2aef83295972863654fde157560;p=u-boot

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

380e86f361e4e2aef83295972863654fde157560
diff --cc include/configs/ls1046a_common.h
index 1fbafaa9c2,47a544c90c..b66b8ac72c
--- a/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