diff options
author | Stefano Babic <sbabic@denx.de> | 2014-04-29 17:41:19 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-04-29 17:41:19 +0200 |
commit | 3deb22a4844cbda1a05c60dd29d8926e4dddaa4e (patch) | |
tree | 767063f0d9e0acfd7445db47abf0d4ac94abdc1d /arch/arm/cpu/armv7/omap-common/boot-common.c | |
parent | 3b31605aef069d183a9d0c1e3aa6f957503cd56b (diff) | |
parent | c9aab0f9dd23fddcebf5984dc19e62b514e759a7 (diff) | |
download | u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.zip u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.gz u-boot-imx-3deb22a4844cbda1a05c60dd29d8926e4dddaa4e.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/boot-common.c')
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/boot-common.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 52e0f4a..3033564 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -56,6 +56,17 @@ void save_omap_boot_params(void) *((u32 *)(dev_data + BOOT_MODE_OFFSET)); } } + +#ifdef CONFIG_DRA7XX + /* + * We get different values for QSPI_1 and QSPI_4 being used, but + * don't actually care about this difference. Rather than + * mangle the later code, if we're coming in as QSPI_4 just + * change to the QSPI_1 value. + */ + if (gd->arch.omap_boot_params.omap_bootdevice == 11) + gd->arch.omap_boot_params.omap_bootdevice = BOOT_DEVICE_SPI; +#endif } #ifdef CONFIG_SPL_BUILD |