diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-04 09:17:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-04 09:17:56 -0400 |
| commit | f532703665ae5e5957211bbc4e7296a8313cc403 (patch) | |
| tree | 83553bf3d230f555feadaa1d3958742f232bd4cc /configs | |
| parent | 797f165f7ae90a75579ae3df7932d8d1518e8544 (diff) | |
| parent | 941f7a4b2606ef468f4f3b763261b758eadee861 (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
This includes Marvell mvpp2 patches with the ethernet support for the
ARMv8 Armada 7k/8k platforms. The ethernet patches are all acked by Joe
and he is okay with me pushing them via the Marvell tree.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mvebu_db-88f7040_defconfig | 3 | ||||
| -rw-r--r-- | configs/mvebu_db-88f8040_defconfig | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/mvebu_db-88f7040_defconfig b/configs/mvebu_db-88f7040_defconfig index f20158a117..797eabbfab 100644 --- a/configs/mvebu_db-88f7040_defconfig +++ b/configs/mvebu_db-88f7040_defconfig @@ -47,7 +47,8 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_PHY_MARVELL=y +CONFIG_MVPP2=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_PCIE_DW_MVEBU=y diff --git a/configs/mvebu_db-88f8040_defconfig b/configs/mvebu_db-88f8040_defconfig index 3611b845fe..046da09786 100644 --- a/configs/mvebu_db-88f8040_defconfig +++ b/configs/mvebu_db-88f8040_defconfig @@ -47,7 +47,8 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y +CONFIG_PHY_MARVELL=y +CONFIG_MVPP2=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_PCIE_DW_MVEBU=y |