arm: juno: Enable DM_ETH

The smc911X driver is now DM enabled, so we can switch the Juno board
over to use DM_ETH for the on-board Fast Ethernet device.
Works out of the box by using the DT.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 832686596e2d0f56eb551f958caf1e03e0e0ff42..f115fcdcc46c9b4c03058979b5cc9db630f2a257 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1180,7 +1180,7 @@ config TARGET_VEXPRESS64_JUNO
        select DM_SERIAL
        select ARM_PSCI_FW
        select PSCI_RESET
-       select DM
+       select DM_ETH
        select BLK
        select USB
        select DM_USB

diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c
index fbfa7a18f1165c3656880331aa6e45d169549b8f..5932a4a0c7052408bc8d67334edb039eec92aa2d 100644 (file)
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -152,11 +152,13 @@ void reset_cpu(ulong addr)
 int board_eth_init(bd_t *bis)
 {
        int rc = 0;
+#ifndef CONFIG_DM_ETH
 #ifdef CONFIG_SMC91111
        rc = smc91111_initialize(0, CONFIG_SMC91111_BASE);
 #endif
 #ifdef CONFIG_SMC911X
        rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
 #endif
        return rc;
 }