summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-11 15:31:25 +0300
committerTom Rini <trini@konsulko.com>2021-08-11 15:31:25 +0300
commit4dc1a5c248ecbd06269a7854dd06c57e9a52f19c (patch)
treee401406a8a04c11e8f365a0769c6fea60b91b366 /configs
parentaba3fa1d3f1dc8f7049317b8d6ea1d8cb8935e5e (diff)
parente21c74f24be5b6d0387d79cb8cf66de0b9b6b0d3 (diff)
downloadu-boot-4dc1a5c248ecbd06269a7854dd06c57e9a52f19c.tar.xz
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Convert GoFlex Home Ethernet and SATA to Driver Model (Tony) - mvebu: Automatically detect CONFIG_SYS_TCLK (Pavel) - mvebu: sata_mv: Fix HDD identication during cold start (Tony) - a37xx: pci: Fix handling PIO config error responses (Pavel) - Other minor misc changes and board maintainer updates
Diffstat (limited to 'configs')
-rw-r--r--configs/goflexhome_defconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 7207fa27e0..17adeca92f 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -16,7 +16,6 @@ CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="GoFlexHome> "
# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_IDE=y
CONFIG_CMD_NAND=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
@@ -48,3 +47,7 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
+CONFIG_CMD_SATA=y
+CONFIG_SATA_MV=y
+CONFIG_DM_ETH=y
+CONFIG_NET_RANDOM_ETHADDR=y