mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-28 14:11:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

spl: Fix SPL EXT support

Browse Source 
Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support.
This patch update error code check to get SPL EXT support working again.

Tested on a Pandaboard (rev. A3).

Reviewed-by: Suriyan Ramasami <suriyan.r@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@ti.com>
This commit is contained in:
Guillaume GARDET 2014-11-25 15:34:16 +01:00 committed by Tom Rini
parent 878cd63e02
commit d3e488eaf4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/spl/spl_ext.c
View File

@ -43,7 +43,7 @@ int spl_load_image_ext(block_dev_desc_t *block_dev,
goto end; goto end;
} }
err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen); err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen);
if (err <= 0) { if (err < 0) {
puts("spl: ext4fs_read failed\n"); puts("spl: ext4fs_read failed\n");
goto end; goto end;
} }
@ -54,12 +54,12 @@ int spl_load_image_ext(block_dev_desc_t *block_dev,
end: end:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
if (err <= 0) if (err < 0)
printf("%s: error reading image %s, err - %d\n", printf("%s: error reading image %s, err - %d\n",
__func__, filename, err); __func__, filename, err);
#endif #endif
return err <= 0; return err < 0;
} }
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
@ -95,7 +95,7 @@ int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition)
goto defaults; goto defaults;
} }
err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen);
if (err <= 0) { if (err < 0) {
printf("spl: error reading image %s, err - %d, falling back to default\n", printf("spl: error reading image %s, err - %d, falling back to default\n",
file, err); file, err);
goto defaults; goto defaults;
@ -124,7 +124,7 @@ defaults:
puts("spl: ext4fs_open failed\n"); puts("spl: ext4fs_open failed\n");
err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen);
if (err <= 0) { if (err < 0) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("%s: error reading image %s, err - %d\n", printf("%s: error reading image %s, err - %d\n",
__func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);