Merge tag 'pull-14nov18' of git://git.denx.de/u-boot-dm
- virtio implementation and supporting patches - DM_FLAG_PRE_RELOC fixes - regmap improvements - minor buildman and sandbox things
This commit is contained in:
13
board/emulation/qemu-arm/Kconfig
Normal file
13
board/emulation/qemu-arm/Kconfig
Normal file
@@ -0,0 +1,13 @@
|
||||
if TARGET_QEMU_ARM_32BIT || TARGET_QEMU_ARM_64BIT
|
||||
|
||||
config SYS_TEXT_BASE
|
||||
default 0x00000000
|
||||
|
||||
config BOARD_SPECIFIC_OPTIONS # dummy
|
||||
def_bool y
|
||||
imply VIRTIO_MMIO
|
||||
imply VIRTIO_PCI
|
||||
imply VIRTIO_NET
|
||||
imply VIRTIO_BLK
|
||||
|
||||
endif
|
||||
@@ -2,8 +2,12 @@
|
||||
/*
|
||||
* Copyright (c) 2017 Tuomas Tynkkynen
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <fdtdec.h>
|
||||
#include <virtio_types.h>
|
||||
#include <virtio.h>
|
||||
|
||||
#ifdef CONFIG_ARM64
|
||||
#include <asm/armv8/mmu.h>
|
||||
@@ -58,6 +62,12 @@ struct mm_region *mem_map = qemu_arm64_mem_map;
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
/*
|
||||
* Make sure virtio bus is enumerated so that peripherals
|
||||
* on the virtio bus can be discovered by their drivers
|
||||
*/
|
||||
virtio_init();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -18,5 +18,16 @@ config SYS_TEXT_BASE
|
||||
config BOARD_SPECIFIC_OPTIONS # dummy
|
||||
def_bool y
|
||||
imply SYS_NS16550
|
||||
imply VIRTIO_MMIO
|
||||
imply VIRTIO_NET
|
||||
imply VIRTIO_BLK
|
||||
imply CMD_PING
|
||||
imply CMD_FS_GENERIC
|
||||
imply DOS_PARTITION
|
||||
imply EFI_PARTITION
|
||||
imply ISO_PARTITION
|
||||
imply CMD_EXT2
|
||||
imply CMD_EXT4
|
||||
imply CMD_FAT
|
||||
|
||||
endif
|
||||
|
||||
@@ -4,12 +4,21 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <fdtdec.h>
|
||||
#include <virtio_types.h>
|
||||
#include <virtio.h>
|
||||
|
||||
#define MROM_FDT_ADDR 0x1020
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
/*
|
||||
* Make sure virtio bus is enumerated so that peripherals
|
||||
* on the virtio bus can be discovered by their drivers
|
||||
*/
|
||||
virtio_init();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,5 +21,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
||||
select X86_RESET_VECTOR
|
||||
select QEMU
|
||||
select BOARD_ROMSIZE_KB_1024
|
||||
imply VIRTIO_PCI
|
||||
imply VIRTIO_NET
|
||||
imply VIRTIO_BLK
|
||||
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user