From: Tom Rini Date: Sat, 4 Feb 2017 01:33:42 +0000 (-0500) Subject: Merge git://git.denx.de/u-boot-fsl-qoriq X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=c83a824e62277162ad35f52879b2316902c0eff5 Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini Conflicts: configs/ls1046aqds_defconfig configs/ls1046aqds_nand_defconfig configs/ls1046aqds_qspi_defconfig configs/ls1046aqds_sdcard_ifc_defconfig configs/ls1046aqds_sdcard_qspi_defconfig configs/ls1046ardb_emmc_defconfig configs/ls1046ardb_qspi_defconfig configs/ls1046ardb_sdcard_defconfig --- c83a824e62277162ad35f52879b2316902c0eff5 diff --cc configs/ls1046aqds_defconfig index 871c35d5e9,15c29c25fa..9986afa742 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@@ -29,6 -29,7 +29,8 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046aqds_nand_defconfig index 2864916bdd,6b188326a6..57937b9a82 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@@ -34,6 -34,7 +34,8 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046aqds_qspi_defconfig index 4d8302e3e8,cdd187ad9f..45782be248 --- a/configs/ls1046aqds_qspi_defconfig +++ b/configs/ls1046aqds_qspi_defconfig @@@ -31,7 -32,7 +31,9 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y +CONFIG_FSL_QSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046aqds_sdcard_ifc_defconfig index 53ee3c56ff,488990a043..caf47fe4b4 --- a/configs/ls1046aqds_sdcard_ifc_defconfig +++ b/configs/ls1046aqds_sdcard_ifc_defconfig @@@ -35,6 -34,7 +35,8 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046aqds_sdcard_qspi_defconfig index 3cf68248e9,800cb2c261..998d2cf821 --- a/configs/ls1046aqds_sdcard_qspi_defconfig +++ b/configs/ls1046aqds_sdcard_qspi_defconfig @@@ -36,7 -36,7 +36,9 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_DSPI=y +CONFIG_FSL_QSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046ardb_emmc_defconfig index fcd15097fa,7b50fc7228..4a34209aa8 --- a/configs/ls1046ardb_emmc_defconfig +++ b/configs/ls1046ardb_emmc_defconfig @@@ -32,6 -31,7 +32,8 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046ardb_qspi_defconfig index 1fb5cac0a9,41d6984e6e..e2eaa9ec98 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@@ -28,6 -29,7 +28,8 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y diff --cc configs/ls1046ardb_sdcard_defconfig index ea1fa799b0,9e6d23b4cb..a8df6cc386 --- a/configs/ls1046ardb_sdcard_defconfig +++ b/configs/ls1046ardb_sdcard_defconfig @@@ -32,6 -31,7 +32,8 @@@ CONFIG_PCI= CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y -CONFIG_NETDEVICES=y -CONFIG_E1000=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y + CONFIG_USB=y + CONFIG_DM_USB=y