diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-08-21 22:56:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-08-21 22:56:01 +0200 |
| commit | f81c3d7232622a2b8c6832d3378dfa775d0e40c0 (patch) | |
| tree | 0b134e257065a049217655f27d73afc44fe13262 /nand_spl/nand_boot_fsl_elbc.c | |
| parent | b644006e1a7baa227aedc606ecdf0bb5eeb24cab (diff) | |
| parent | 269610f6ba2e4a7bc27d2e53d43160614016964f (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'nand_spl/nand_boot_fsl_elbc.c')
| -rw-r--r-- | nand_spl/nand_boot_fsl_elbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c index 0d0c44e1e3..7f14a6fe45 100644 --- a/nand_spl/nand_boot_fsl_elbc.c +++ b/nand_spl/nand_boot_fsl_elbc.c @@ -120,7 +120,7 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst) pos += page_size; offs += page_size; - } while (offs & (block_size - 1)); + } while ((offs & (block_size - 1)) && (pos < uboot_size)); } } |