diff options
author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2016-11-06 18:33:57 +0100 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-11-21 14:07:27 -0500 |
commit | 66a47ff2d8f037e1e9d641623257894a9975c325 (patch) | |
tree | e88226f6c864e3916648c4ce09ccd0af9b194a37 /common/spl/spl_ext.c | |
parent | f81db56f2fd6dc16efeaec2961121244765a1f11 (diff) | |
download | u-boot-imx-66a47ff2d8f037e1e9d641623257894a9975c325.zip u-boot-imx-66a47ff2d8f037e1e9d641623257894a9975c325.tar.gz u-boot-imx-66a47ff2d8f037e1e9d641623257894a9975c325.tar.bz2 |
ext4: Allow reading files with non-zero offset, clamp read len
Support was already implemented, but not hooked up. This fixes several
fails in the test cases.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'common/spl/spl_ext.c')
-rw-r--r-- | common/spl/spl_ext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index b93e1ea..1b8e15e 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -42,7 +42,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, puts("spl: ext4fs_open failed\n"); goto end; } - err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen); + err = ext4fs_read((char *)header, 0, sizeof(struct image_header), &actlen); if (err < 0) { puts("spl: ext4fs_read failed\n"); goto end; @@ -54,7 +54,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, goto end; } - err = ext4fs_read((char *)spl_image->load_addr, filelen, &actlen); + err = ext4fs_read((char *)spl_image->load_addr, 0, filelen, &actlen); end: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT @@ -97,7 +97,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, puts("spl: ext4fs_open failed\n"); goto defaults; } - err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); + err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, filelen, &actlen); if (err < 0) { printf("spl: error reading image %s, err - %d, falling back to default\n", file, err); @@ -127,7 +127,7 @@ defaults: if (err < 0) 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, 0, filelen, &actlen); if (err < 0) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", |