leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: qemu: use device tree passed by prior boot stage

Browse Source 
QEMU provides a device tree, which is passed to U-Boot using register
a1. We are now able to directly select the device tree with the
configuration CONFIG_OF_PRIOR_STAGE. Replace the hard-coded address in
qemu-riscv with it.

Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Rick Chen <rick@andestech.com>
This commit is contained in:
Lukas Auer 2018-11-22 11:26:30 +01:00 committed by Andes
parent 5d8b2e7711
commit 6e10e94ff7
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
board/emulation/qemu-riscv/qemu-riscv.c
View File

@ -9,8 +9,6 @@
#include <virtio_types.h> #include <virtio_types.h>
#include <virtio.h> #include <virtio.h>
#define MROM_FDT_ADDR 0x1020
int board_init(void) int board_init(void)
{ {
/* /*
@ -21,12 +19,3 @@ int board_init(void)
return 0; return 0;
} }
void *board_fdt_blob_setup(void)
{
/*
* QEMU loads a generated DTB for us immediately
* after the reset vectors in the MROM
*/
return (void *)MROM_FDT_ADDR;
}

2
configs/qemu-riscv32_defconfig
View File

@ -3,4 +3,4 @@ CONFIG_TARGET_QEMU_VIRT=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y CONFIG_DISPLAY_BOARDINFO=y
CONFIG_OF_BOARD=y CONFIG_OF_PRIOR_STAGE=y

2
configs/qemu-riscv64_defconfig
View File

@ -4,4 +4,4 @@ CONFIG_ARCH_RV64I=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y CONFIG_DISPLAY_BOARDINFO=y
CONFIG_OF_BOARD=y CONFIG_OF_PRIOR_STAGE=y