summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-12-08 20:54:13 +0100
committerWolfgang Denk <wd@denx.de>2011-12-08 20:54:13 +0100
commit4b6f394fc41d7aee40467c30807b5ea03e2f6649 (patch)
treeebf219811d5aecaf9db92ebe5b09c5f246d67bfc
parent3073abdd6af53b9da88cd9a47fc9f7ce65fd20ea (diff)
parent40a0682d4ae69bdd8b6aa10b6dcb57a489ae875c (diff)
downloadu-boot-imx-4b6f394fc41d7aee40467c30807b5ea03e2f6649.zip
u-boot-imx-4b6f394fc41d7aee40467c30807b5ea03e2f6649.tar.gz
u-boot-imx-4b6f394fc41d7aee40467c30807b5ea03e2f6649.tar.bz2
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
-rw-r--r--drivers/mtd/nand/nand_spl_load.c13
-rw-r--r--drivers/mtd/nand/nand_spl_simple.c6
-rw-r--r--nand_spl/nand_boot.c3
3 files changed, 9 insertions, 13 deletions
diff --git a/drivers/mtd/nand/nand_spl_load.c b/drivers/mtd/nand/nand_spl_load.c
index ae8d5ac..215459a 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 ed821f2..7eb08a3 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;
diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index bee1029..2326962 100644
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -147,7 +147,6 @@ static int nand_read_page(struct mtd_info *mtd, 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
@@ -170,7 +169,7 @@ static int nand_read_page(struct mtd_info *mtd, 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;