arm: am33xx: Handle NAND+I2C boot-device the same way as NAND
PATCH 1/1 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 <[email protected]>
Cc Tom Rini <[email protected]>
Cc Roger Meier <[email protected]>
Cc Samuel Egli <[email protected]>
--- arch/arm/cpu/armv7/omap-common/boot-common.c | 15 +++++++++++++-- arch/arm/include/asm/arch-am33xx/spl.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/boot-common.c +13 -2
@@ -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 ));
arch/arm/include/asm/arch-am33xx/spl.h +1 -0
@@ -25,6 +25,7 @@#else #define BOOT_DEVICE_XIP 2#define BOOT_DEVICE_NAND 5 +#define BOOT_DEVICE_NAND_I2C 6#if defined(CONFIG_AM33XX )#define BOOT_DEVICE_MMC1 8#define BOOT_DEVICE_MMC2 9/* eMMC or daughter card */
Signature · 1 line
2.1.3
Quoted 11 lines · Stefan Roese
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 <[email protected]>Cc Tom Rini <[email protected]>Cc Roger Meier <[email protected]>Cc Samuel Egli <[email protected]>
Applied to u-boot-ti/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141205/4ed92f45/attachment.pgp>