diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-08-29 08:17:04 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-12-18 22:25:13 -0700 |
| commit | a9ed02efb26a4d89e93d9082a7db8c550740557f (patch) | |
| tree | 489bfb456e31ffb44dc0dae58ec286264b816468 | |
| parent | 5de8a3160e71adde4b1a96f6448b225e7fdd9c2e (diff) | |
Allow loading of u-boot.bin for backward compatibility
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_mmc.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c index 6f5b43e55..1c3af5f65 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c +++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c @@ -87,6 +87,7 @@ static void mmc_load_image_fat(struct mmc *mmc) { s32 err; struct image_header *header; + char *payloadname; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); @@ -98,20 +99,27 @@ static void mmc_load_image_fat(struct mmc *mmc) hang(); } - err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, + payloadname = CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME; + err = file_fat_read(payloadname, (u8 *)header, sizeof(struct image_header)); - if (err <= 0) - goto end; + if (err <= 0) { + payloadname = "u-boot.bin"; + err = file_fat_read(payloadname, + (u8 *)header, sizeof(struct image_header)); + if (err <= 0) { + goto end; + } + } spl_parse_image_header(header); - err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, + err = file_fat_read(payloadname, (u8 *)spl_image.load_addr, 0); end: if (err <= 0) { printf("spl: error reading image %s, err - %d\n", - CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err); + payloadname, err); hang(); } } |