aboutsummaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini2018-11-16 07:37:50 -0600
committerTom Rini2018-11-16 07:37:50 -0600
commit1d6edcbfed2af33c748f2beb399810a0441888da (patch)
treefe88d63e5ef1dbe1915f90e02429e8b6934859da /board
parentf6206f8587fc7ec82a57dbbeb5de0f94b3c2ef49 (diff)
parent4c6e27f63c88d065a98f438085dfc36af47d3a23 (diff)
downloadu-boot-master.tar.gz
u-boot-master.tar.xz
u-boot-master.zip
Merge tag 'pull-14nov18' of git://git.denx.de/u-boot-dmHEADupstream-mastermaster
- virtio implementation and supporting patches - DM_FLAG_PRE_RELOC fixes - regmap improvements - minor buildman and sandbox things
Diffstat (limited to 'board')
-rw-r--r--board/emulation/qemu-arm/Kconfig13
-rw-r--r--board/emulation/qemu-arm/qemu-arm.c10
-rw-r--r--board/emulation/qemu-riscv/Kconfig11
-rw-r--r--board/emulation/qemu-riscv/qemu-riscv.c9
-rw-r--r--board/emulation/qemu-x86/Kconfig3
5 files changed, 46 insertions, 0 deletions
diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig
new file mode 100644
index 0000000000..02ae4d9884
--- /dev/null
+++ b/board/emulation/qemu-arm/Kconfig
@@ -0,0 +1,13 @@
1if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT
2
3config SYS_TEXT_BASE
4 default 0x00000000
5
6config BOARD_SPECIFIC_OPTIONS # dummy
7 def_bool y
8 imply VIRTIO_MMIO
9 imply VIRTIO_PCI
10 imply VIRTIO_NET
11 imply VIRTIO_BLK
12
13endif
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
59int board_init(void) 63int 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
diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index af23363fcf..37a80db6a9 100644
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -18,5 +18,16 @@ config SYS_TEXT_BASE
18config BOARD_SPECIFIC_OPTIONS # dummy 18config BOARD_SPECIFIC_OPTIONS # dummy
19 def_bool y 19 def_bool y
20 imply SYS_NS16550 20 imply SYS_NS16550
21 imply VIRTIO_MMIO
22 imply VIRTIO_NET
23 imply VIRTIO_BLK
24 imply CMD_PING
25 imply CMD_FS_GENERIC
26 imply DOS_PARTITION
27 imply EFI_PARTITION
28 imply ISO_PARTITION
29 imply CMD_EXT2
30 imply CMD_EXT4
31 imply CMD_FAT
21 32
22endif 33endif
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index 041e716c9b..2730a288fb 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -4,12 +4,21 @@
4 */ 4 */
5 5
6#include <common.h> 6#include <common.h>
7#include <dm.h>
7#include <fdtdec.h> 8#include <fdtdec.h>
9#include <virtio_types.h>
10#include <virtio.h>
8 11
9#define MROM_FDT_ADDR 0x1020 12#define MROM_FDT_ADDR 0x1020
10 13
11int board_init(void) 14int board_init(void)
12{ 15{
16 /*
17 * Make sure virtio bus is enumerated so that peripherals
18 * on the virtio bus can be discovered by their drivers
19 */
20 virtio_init();
21
13 return 0; 22 return 0;
14} 23}
15 24
diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig
index 41a27dd933..6d19299d8b 100644
--- a/board/emulation/qemu-x86/Kconfig
+++ b/board/emulation/qemu-x86/Kconfig
@@ -21,5 +21,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
21 select X86_RESET_VECTOR 21 select X86_RESET_VECTOR
22 select QEMU 22 select QEMU
23 select BOARD_ROMSIZE_KB_1024 23 select BOARD_ROMSIZE_KB_1024
24 imply VIRTIO_PCI
25 imply VIRTIO_NET
26 imply VIRTIO_BLK
24 27
25endif 28endif