diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-08 20:54:13 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-08 20:54:13 +0100 |
| commit | 4b6f394fc41d7aee40467c30807b5ea03e2f6649 (patch) | |
| tree | ebf219811d5aecaf9db92ebe5b09c5f246d67bfc /drivers | |
| parent | 3073abdd6af53b9da88cd9a47fc9f7ce65fd20ea (diff) | |
| parent | 40a0682d4ae69bdd8b6aa10b6dcb57a489ae875c (diff) | |
| download | talos-obmc-uboot-4b6f394fc41d7aee40467c30807b5ea03e2f6649.tar.gz talos-obmc-uboot-4b6f394fc41d7aee40467c30807b5ea03e2f6649.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
* 'master' of git://git.denx.de/u-boot-nand-flash:
nand_spl/nand_boot.c: Fix build warning
drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning
drivers/mtd/nand/nand_spl_simple.c: Fix GCC 4.6 warnings
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/nand_spl_load.c | 13 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_spl_simple.c | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/drivers/mtd/nand/nand_spl_load.c b/drivers/mtd/nand/nand_spl_load.c index ae8d5ac0e6..215459a83c 100644 --- a/drivers/mtd/nand/nand_spl_load.c +++ b/drivers/mtd/nand/nand_spl_load.c @@ -28,23 +28,22 @@ */ void nand_boot(void) { - int ret; __attribute__((noreturn)) void (*uboot)(void); /* * Load U-Boot image from NAND into RAM */ - ret = nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, + nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, - (void *)CONFIG_SYS_NAND_U_BOOT_DST); + (void *)CONFIG_SYS_NAND_U_BOOT_DST); #ifdef CONFIG_NAND_ENV_DST - ret = nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, - (void *)CONFIG_NAND_ENV_DST); + nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, + (void *)CONFIG_NAND_ENV_DST); #ifdef CONFIG_ENV_OFFSET_REDUND - ret = nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, - (void *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE); + nand_spl_load_image(CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, + (void *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE); #endif #endif diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c index ed821f244d..7eb08a3b08 100644 --- a/drivers/mtd/nand/nand_spl_simple.c +++ b/drivers/mtd/nand/nand_spl_simple.c @@ -153,7 +153,6 @@ static int nand_read_page(int block, int page, uchar *dst) int eccbytes = CONFIG_SYS_NAND_ECCBYTES; int eccsteps = CONFIG_SYS_NAND_ECCSTEPS; uint8_t *p = dst; - int stat; /* * No malloc available for now, just use some temporary locations @@ -176,7 +175,7 @@ static int nand_read_page(int block, int page, uchar *dst) this->ecc.hwctl(&mtd, NAND_ECC_READ); this->read_buf(&mtd, p, eccsize); this->ecc.calculate(&mtd, p, &ecc_calc[i]); - stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]); + this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]); } return 0; @@ -193,7 +192,6 @@ static int nand_read_page(int block, int page, void *dst) int eccbytes = CONFIG_SYS_NAND_ECCBYTES; int eccsteps = CONFIG_SYS_NAND_ECCSTEPS; uint8_t *p = dst; - int stat; nand_command(block, page, 0, NAND_CMD_READ0); @@ -224,7 +222,7 @@ static int nand_read_page(int block, int page, void *dst) * from correct_data(). We just hope that all possible errors * are corrected by this routine. */ - stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]); + this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]); } return 0; |
