diff options
-rw-r--r-- | board/emulation/qemu-arm/Kconfig | 4 | ||||
-rw-r--r-- | board/emulation/qemu-arm/qemu-arm.c | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig index d1c08c2f6a..02ae4d9884 100644 --- a/board/emulation/qemu-arm/Kconfig +++ b/board/emulation/qemu-arm/Kconfig | |||
@@ -5,5 +5,9 @@ config SYS_TEXT_BASE | |||
5 | 5 | ||
6 | config BOARD_SPECIFIC_OPTIONS # dummy | 6 | config BOARD_SPECIFIC_OPTIONS # dummy |
7 | def_bool y | 7 | def_bool y |
8 | imply VIRTIO_MMIO | ||
9 | imply VIRTIO_PCI | ||
10 | imply VIRTIO_NET | ||
11 | imply VIRTIO_BLK | ||
8 | 12 | ||
9 | endif | 13 | endif |
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c index 812c90636d..e1f4709c4c 100644 --- a/board/emulation/qemu-arm/qemu-arm.c +++ b/board/emulation/qemu-arm/qemu-arm.c | |||
@@ -2,8 +2,12 @@ | |||
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Tuomas Tynkkynen | 3 | * Copyright (c) 2017 Tuomas Tynkkynen |
4 | */ | 4 | */ |
5 | |||
5 | #include <common.h> | 6 | #include <common.h> |
7 | #include <dm.h> | ||
6 | #include <fdtdec.h> | 8 | #include <fdtdec.h> |
9 | #include <virtio_types.h> | ||
10 | #include <virtio.h> | ||
7 | 11 | ||
8 | #ifdef CONFIG_ARM64 | 12 | #ifdef CONFIG_ARM64 |
9 | #include <asm/armv8/mmu.h> | 13 | #include <asm/armv8/mmu.h> |
@@ -58,6 +62,12 @@ struct mm_region *mem_map = qemu_arm64_mem_map; | |||
58 | 62 | ||
59 | int board_init(void) | 63 | int board_init(void) |
60 | { | 64 | { |
65 | /* | ||
66 | * Make sure virtio bus is enumerated so that peripherals | ||
67 | * on the virtio bus can be discovered by their drivers | ||
68 | */ | ||
69 | virtio_init(); | ||
70 | |||
61 | return 0; | 71 | return 0; |
62 | } | 72 | } |
63 | 73 | ||