diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-05 08:37:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-05 12:29:59 -0500 |
| commit | bdac5e18a80427e1f44413dce78aefece956ffc2 (patch) | |
| tree | 769c69845b4e6643209b60d3959db2616159d4af /configs/turris_omnia_defconfig | |
| parent | c0bf3968d7fffa135305ba58644773d32f51090a (diff) | |
| parent | f18220919079eeb8e79f4791e152f1db073574a8 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Move Armada XP / 38x PCIe driver to DM_PCI from me
- Move Armada XP / 38x LCD driver to DM_VIDEO from me
- Add uDPU board (Armada-3720) from Vladimir
[trini: Fix warning in pci-uclass.c by removing ret from
pci_uclass_child_post_bind as it no longer calls functions with
a return code to catch.]
Signed-off-by: Tom Rini <trini@konsulko.com>II
Diffstat (limited to 'configs/turris_omnia_defconfig')
| -rw-r--r-- | configs/turris_omnia_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index 4a1e23c86c..5cafe2ee34 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -37,7 +37,6 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_SCSI_AHCI=y -CONFIG_MISC=y CONFIG_ATSHA204A=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y @@ -45,6 +44,8 @@ CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y CONFIG_MVNETA=y CONFIG_MII=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y |