diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-16 09:32:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-16 09:32:04 -0500 |
| commit | ebca2083d3689c77c7d1365f1e6862b55abef8a2 (patch) | |
| tree | 34cfd94b54d9ab2f76a67744f9297694dcdffda8 /configs | |
| parent | 72061f78462dbe09b37ec4575874a046bb9c0b03 (diff) | |
| parent | 8c1ce928f498774a3e2c3aa03534b6e6ca6d4759 (diff) | |
| download | u-boot-ebca2083d3689c77c7d1365f1e6862b55abef8a2.zip u-boot-ebca2083d3689c77c7d1365f1e6862b55abef8a2.tar.gz u-boot-ebca2083d3689c77c7d1365f1e6862b55abef8a2.tar.bz2 | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/clearfog_defconfig | 6 | ||||
| -rw-r--r-- | configs/mvebu_db_armada8k_defconfig | 1 | ||||
| -rw-r--r-- | configs/mvebu_mcbin-88f8040_defconfig | 1 | ||||
| -rw-r--r-- | configs/theadorable_debug_defconfig | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index fa9f04a..5fa645a 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -43,5 +43,9 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_STORAGE=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig index 9fa4d9f..cffb3d0 100644 --- a/configs/mvebu_db_armada8k_defconfig +++ b/configs/mvebu_db_armada8k_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_MVEBU_ARMADA_8K=y CONFIG_DEFAULT_DEVICE_TREE="armada-8040-db" +CONFIG_DISTRO_DEFAULTS=y CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig index 9afe651..f779793 100644 --- a/configs/mvebu_mcbin-88f8040_defconfig +++ b/configs/mvebu_mcbin-88f8040_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_MVEBU_ARMADA_8K=y CONFIG_DEFAULT_DEVICE_TREE="armada-8040-mcbin" +CONFIG_DISTRO_DEFAULTS=y CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index 75d592e..863d6ce 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y |