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

diff --cc 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 --cc include/configs/nitrogen6x.h
Simple merge