summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2020-12-14 15:11:05 -0500
committerTom Rini <[email protected]>2020-12-14 15:11:05 -0500
commitf40825e18e0a8560991072114b9b10b33fdad95b (patch)
tree1bb86f5f0d7c4337c21da3221a460fffd28ebc61 /include
parent5a1a8a63be8f7262a300eddafb18020926b12fb6 (diff)
parent9afaeec6ef8bbc6cf936d2a9c3d28caffca5bf7e (diff)
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv
- Fix wrong amoswap t1 usage in startup. - Reset the board after crash. - Enable distro booting from an attached SCSI disk for QEMU. - Support the optional header fields in efi header.
Diffstat (limited to 'include')
-rw-r--r--include/configs/qemu-riscv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index aed9a4ae990..a2f33587c24 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -35,6 +35,7 @@
#define BOOT_TARGET_DEVICES(func) \
func(QEMU, qemu, na) \
func(VIRTIO, virtio, 0) \
+ func(SCSI, scsi, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>