summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2020-06-11 14:03:18 +0300
committerTom Rini <trini@konsulko.com>2020-07-08 01:23:48 +0300
commitcc696e7caec612c1e334db8cd729e0045662bf00 (patch)
treee028c8ecc323b5ea8b8b5ac3893e1d2a93811986
parent117a52e2387bdfcf7f74c5ec6c4985cdd7c5403e (diff)
downloadu-boot-cc696e7caec612c1e334db8cd729e0045662bf00.tar.xz
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>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--board/armltd/vexpress64/vexpress64.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 832686596e..f115fcdcc4 100644
--- 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 fbfa7a18f1..5932a4a0c7 100644
--- 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;
}