diff options
| author | Peter Hoyes <Peter.Hoyes@arm.com> | 2021-11-11 09:26:03 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-04 22:48:48 -0500 |
| commit | 439581dca4c786dbbdd2d6be024e0b907a3b0c80 (patch) | |
| tree | c06c897a36d854cb8abe9e8e18150f7d8f22c34d | |
| parent | 2661397464e47d45cd25bbc5e6b9de7594b3268d (diff) | |
| download | u-boot-439581dca4c786dbbdd2d6be024e0b907a3b0c80.tar.gz | |
vexpress64: Enable VIRTIO_NET network driver
The SMSC driver is using the old driver model.
Init the virtio system in vexpress64.c so that the network device is
discovered.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
| -rw-r--r-- | board/armltd/vexpress64/vexpress64.c | 7 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index d17b463be57..5e22e89824e 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -18,6 +18,10 @@ #include <dm/platform_data/serial_pl01x.h> #include "pcie.h" #include <asm/armv8/mmu.h> +#ifdef CONFIG_VIRTIO_NET +#include <virtio_types.h> +#include <virtio.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -64,6 +68,9 @@ __weak void vexpress64_pcie_init(void) int board_init(void) { vexpress64_pcie_init(); +#ifdef CONFIG_VIRTIO_NET + virtio_init(); +#endif return 0; } diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 5f7d19daad3..54e8caeb7bc 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -88,8 +88,8 @@ #endif #endif /* !CONFIG_GICV3 */ -#ifndef CONFIG_TARGET_VEXPRESS64_JUNO -/* The Vexpress64 simulators use SMSC91C111 */ +#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH) +/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */ #define CONFIG_SMC91111 1 #define CONFIG_SMC91111_BASE (V2M_PA_BASE + 0x01A000000) #endif |