Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

diff --combined drivers/pci/Makefile
index f0dfb5994cf2aac0b6250c06747926e5adfede59,18458d3d9b6fd7186c1948901841a1899058a19f..e73a4986198372fb94c5bfff51e04d62ba055d28
--- 1/drivers/pci/Makefile
--- 2/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -10,7 -10,9 +10,8 @@@ obj-$(CONFIG_PCI) += pci.o pci_auto.
  obj-$(CONFIG_PCI_INDIRECT_BRIDGE) += pci_indirect.o
  obj-$(CONFIG_PCI_GT64120) += pci_gt64120.o
  obj-$(CONFIG_PCI_MSC01) += pci_msc01.o
+ obj-$(CONFIG_PCIE_IMX) += pcie_imx.o
  obj-$(CONFIG_FTPCI100) += pci_ftpci100.o
 -obj-$(CONFIG_IXP_PCI) += pci_ixp.o
  obj-$(CONFIG_SH4_PCI) += pci_sh4.o
  obj-$(CONFIG_SH7751_PCI) +=pci_sh7751.o
  obj-$(CONFIG_SH7780_PCI) +=pci_sh7780.o

diff --combined include/configs/nitrogen6x.h
index e44ec88f71b3f05642c87a6f21c1aebdea1cfe21,e6565518cdf46f71da1db2daa8afde5466608d1c..ac517ce25ed8c09ac10c35d07bf58871112cbabc
--- 1/include/configs/nitrogen6x.h
--- 2/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@@ -31,7 -31,7 +31,7 @@@
  #define CONFIG_BOARD_EARLY_INIT_F
  #define CONFIG_MISC_INIT_R
  #define CONFIG_MXC_GPIO
 -#define CONFIG_MV_UDC
 +#define CONFIG_CI_UDC
  #define CONFIG_USBD_HS
  #define CONFIG_USB_GADGET_DUALSPEED
  #define CONFIG_USB_ETHER
@@@ -352,4 -352,15 +352,15 @@@
  #define CONFIG_SUPPORT_RAW_INITRD
  #define CONFIG_CMD_FS_GENERIC
  
+ /*
+  * PCI express
+  */
+ #define CONFIG_CMD_PCI
+ #ifdef CONFIG_CMD_PCI
+ #define CONFIG_PCI
+ #define CONFIG_PCI_PNP
+ #define CONFIG_PCI_SCAN_SHOW
+ #define CONFIG_PCIE_IMX
+ #endif
+ 
  #endif               /* __CONFIG_H */