diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-08 18:04:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-08 18:04:13 -0500 |
| commit | e8e3f2d2d48f97b2c79b698eccedce8f4f880993 (patch) | |
| tree | dc92c94f1c2451050dbfe07c18909d27d621be90 /include | |
| parent | 606b239a6c60868da1767b973e5f9c3e6eae48fe (diff) | |
| parent | 279dc04f25538eb69f4377d73a9f2889a651cf5f (diff) | |
| download | u-boot-e8e3f2d2d48f97b2c79b698eccedce8f4f880993.tar.gz u-boot-e8e3f2d2d48f97b2c79b698eccedce8f4f880993.tar.xz u-boot-e8e3f2d2d48f97b2c79b698eccedce8f4f880993.zip | |
Merge branch '2019-03-08-master-imports'
- Assorted minor fixes:
- ARM: qemu-arm: enable USB boot in distro boot with UEFI
- image: fdt: handle coalesced reserve region
- cmd: thordown: Fix spelling of download.
- fdt: Fix FIT header verification in mkimage and conduct same checks
as bootm
- test: Update test-imagetools.sh to match new syntax
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-arm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 0431a7982d..65fdb1e929 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -25,6 +25,7 @@ #define CONFIG_ENV_SIZE SZ_256K #define BOOT_TARGET_DEVICES(func) \ + func(USB, usb, 0) \ func(SCSI, scsi, 0) \ func(VIRTIO, virtio, 0) \ func(DHCP, dhcp, na) |