summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common/boot-common.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2014-11-12 11:57:33 +0100
committerTom Rini <trini@ti.com>2014-12-04 21:28:31 -0500
commite49631afa074e2cb8ea5baddbbe8b9483a491e32 (patch)
treef012183669f527c1dabbf265fb772c1e55399d60 /arch/arm/cpu/armv7/omap-common/boot-common.c
parentae525189f032f3ee2edadc6bc66b29e96969592c (diff)
downloadblackbird-obmc-uboot-e49631afa074e2cb8ea5baddbbe8b9483a491e32.tar.gz
blackbird-obmc-uboot-e49631afa074e2cb8ea5baddbbe8b9483a491e32.zip
arm: am33xx: Handle NAND+I2C boot-device the same way as NAND
Re-map NAND&I2C boot-device to the "normal" NAND boot-device. Otherwise the SPL boot IF can't handle this device correctly. Somehow booting with Hynix 4GBit NAND H27U4G8 on Siemens Draco leads to this boot-device passed to SPL from the BootROM. With this change, Draco boots just fine into main U-Boot. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Roger Meier <r.meier@siemens.com> Cc: Samuel Egli <samuel.egli@siemens.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/boot-common.c')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index b819fe2e64..cb18908867 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -33,8 +33,19 @@ void save_omap_boot_params(void)
* used. But it not correct to assume that romcode structure
* encoding would be same as u-boot. So use the defined offsets.
*/
- gd->arch.omap_boot_params.omap_bootdevice = boot_device =
- *((u8 *)(rom_params + BOOT_DEVICE_OFFSET));
+ boot_device = *((u8 *)(rom_params + BOOT_DEVICE_OFFSET));
+
+#if defined(BOOT_DEVICE_NAND_I2C)
+ /*
+ * Re-map NAND&I2C boot-device to the "normal" NAND boot-device.
+ * Otherwise the SPL boot IF can't handle this device correctly.
+ * Somehow booting with Hynix 4GBit NAND H27U4G8 on Siemens
+ * Draco leads to this boot-device passed to SPL from the BootROM.
+ */
+ if (boot_device == BOOT_DEVICE_NAND_I2C)
+ boot_device = BOOT_DEVICE_NAND;
+#endif
+ gd->arch.omap_boot_params.omap_bootdevice = boot_device;
gd->arch.omap_boot_params.ch_flags =
*((u8 *)(rom_params + CH_FLAGS_OFFSET));
OpenPOWER on IntegriCloud