diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-16 08:31:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-16 08:31:05 -0500 |
| commit | b89074f65047c4058741ed2bf3e6ff0c5af4c5bc (patch) | |
| tree | 5914ea3da258d0891278a5452e11f4a49b283e87 /arch/arm/mach-omap2/boot-common.c | |
| parent | d391c13c99a2b48c98cef6df4479247cd4e62f9d (diff) | |
| parent | 6ed4d26c21e46ed00ea65679b40aaf967d043dfd (diff) | |
Merge tag 'u-boot-imx-2019-02-16' of git://git.denx.de/u-boot-imx
u-boot-imx-2019-02-16
---------------------
- vhybrid: add calibration
- gw_ventana: fixes
- Improve documentation for Secure Boot (HABv4)
- Fix Marvell Switch
- MX6 Sabre, switch to DM
- Fixes for NAND
Diffstat (limited to 'arch/arm/mach-omap2/boot-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 2db19227b92..c8b8ac657fb 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -93,7 +93,7 @@ void save_omap_boot_params(void) sys_boot_device = 1; break; #endif -#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT) +#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_STORAGE) case BOOT_DEVICE_USB: sys_boot_device = 1; break; |