diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2020-04-16 18:09:28 +0300 |
|---|---|---|
| committer | Andes <uboot@andestech.com> | 2020-04-23 05:14:06 +0300 |
| commit | ed1475e2f46cec0dbde308a67576f9ea32b0287c (patch) | |
| tree | 2a016c165c55b6fb8540255cb345e169ad919349 | |
| parent | 846b6120140ae98ca88d245fb10955d3c6980603 (diff) | |
| download | u-boot-ed1475e2f46cec0dbde308a67576f9ea32b0287c.tar.xz | |
riscv: qemu: Remove the simple-bus driver for the SoC node
Prior to QEMU v3.1.0, QEMU generated the 'virt' SoC node with a
"riscv-virtio-soc" compatible string, and a "simple-bus" driver
was created to accommodate that special case in U-Boot.
Starting from QEMU v3.1.0, the SoC node was set as a "simple-bus",
hence the special simple-bus driver is no longer needed.
Update the doc to mention the latest tested QEMU version 4.2.0.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | arch/riscv/cpu/generic/cpu.c | 14 | ||||
| -rw-r--r-- | doc/board/emulation/qemu-riscv.rst | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c index c0a5288bdb..13a69ef0cc 100644 --- a/arch/riscv/cpu/generic/cpu.c +++ b/arch/riscv/cpu/generic/cpu.c @@ -4,7 +4,6 @@ */ #include <common.h> -#include <dm.h> #include <irq_func.h> /* @@ -21,16 +20,3 @@ int cleanup_before_linux(void) return 0; } - -/* To enumerate devices on the /soc/ node, create a "simple-bus" driver */ -static const struct udevice_id riscv_virtio_soc_ids[] = { - { .compatible = "riscv-virtio-soc" }, - { } -}; - -U_BOOT_DRIVER(riscv_virtio_soc) = { - .name = "riscv_virtio_soc", - .id = UCLASS_SIMPLE_BUS, - .of_match = riscv_virtio_soc_ids, - .flags = DM_FLAG_PRE_RELOC, -}; diff --git a/doc/board/emulation/qemu-riscv.rst b/doc/board/emulation/qemu-riscv.rst index fe7505e201..c390006b31 100644 --- a/doc/board/emulation/qemu-riscv.rst +++ b/doc/board/emulation/qemu-riscv.rst @@ -56,7 +56,7 @@ For instructions on how to run U-Boot in supervisor mode on QEMU with OpenSBI, see the documentation available with OpenSBI: https://github.com/riscv/opensbi/blob/master/docs/platform/qemu_virt.md -These have been tested in QEMU 3.0.0. +These have been tested in QEMU 4.2.0. Running U-Boot SPL ------------------ |