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 /scripts | |
| parent | c0bf3968d7fffa135305ba58644773d32f51090a (diff) | |
| parent | f18220919079eeb8e79f4791e152f1db073574a8 (diff) | |
| download | u-boot-bdac5e18a80427e1f44413dce78aefece956ffc2.tar.gz u-boot-bdac5e18a80427e1f44413dce78aefece956ffc2.tar.xz u-boot-bdac5e18a80427e1f44413dce78aefece956ffc2.zip | |
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 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b425cc360f..f7f30d15ae 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1443,7 +1443,6 @@ CONFIG_PCI_MEM_BUS CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_SIZE CONFIG_PCI_MSC01 -CONFIG_PCI_MVEBU CONFIG_PCI_NOSCAN CONFIG_PCI_OHCI CONFIG_PCI_OHCI_DEVNO |