diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-01 01:58:44 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-01 01:58:44 (GMT) |
| commit | fe4ba689a0cb2bb2ceafb88556a57bd80814b648 (patch) | |
| tree | 1012656ba1d3e9f8288d69de33c71417b2f22466 /common/spl/spl.c | |
| parent | f413d1cae89143ad45b066b3d3bc602deafcb50a (diff) | |
| parent | 4c043712e9910ef1d612aedbd8304a1f7348ef5f (diff) | |
| download | u-boot-fsl-qoriq-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/dra7xx_evm.h
Diffstat (limited to 'common/spl/spl.c')
| -rw-r--r-- | common/spl/spl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index e14ec80..57b73af 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -174,7 +174,7 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) # define CONFIG_SPL_LOAD_FIT_ADDRESS 0 #endif -#ifdef CONFIG_SPL_RAM_DEVICE +#if defined(CONFIG_SPL_RAM_DEVICE) || defined(CONFIG_SPL_DFU_SUPPORT) static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { @@ -312,6 +312,9 @@ struct boot_device_name boot_name_table[] = { #ifdef CONFIG_SPL_USB_SUPPORT { BOOT_DEVICE_USB, "USB" }, #endif +#ifdef CONFIG_SPL_DFU_SUPPORT + { BOOT_DEVICE_DFU, "USB DFU" }, +#endif #ifdef CONFIG_SPL_SATA_SUPPORT { BOOT_DEVICE_SATA, "SATA" }, #endif @@ -398,6 +401,11 @@ static int spl_load_image(u32 boot_device) case BOOT_DEVICE_USB: return spl_usb_load_image(); #endif +#ifdef CONFIG_SPL_DFU_SUPPORT + case BOOT_DEVICE_DFU: + spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0"); + return spl_ram_load_image(); +#endif #ifdef CONFIG_SPL_SATA_SUPPORT case BOOT_DEVICE_SATA: return spl_sata_load_image(); |