diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-30 21:58:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-30 21:58:44 -0400 |
| commit | fe4ba689a0cb2bb2ceafb88556a57bd80814b648 (patch) | |
| tree | 1012656ba1d3e9f8288d69de33c71417b2f22466 /arch/arm/include | |
| parent | f413d1cae89143ad45b066b3d3bc602deafcb50a (diff) | |
| parent | 4c043712e9910ef1d612aedbd8304a1f7348ef5f (diff) | |
| download | u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.zip u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.gz u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.bz2 | |
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 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-omap5/spl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h index 468ff5a..3582880 100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++ b/arch/arm/include/asm/arch-omap5/spl.h @@ -20,7 +20,7 @@ #define BOOT_DEVICE_QSPI_1 0x0A #define BOOT_DEVICE_QSPI_4 0x0B #define BOOT_DEVICE_UART 0x43 -#define BOOT_DEVICE_USB 0x45 +#define BOOT_DEVICE_DFU 0x45 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2_2 |