aboutsummaryrefslogtreecommitdiff
path: root/nand_spl
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2011-11-15 08:02:54 +0000
committerWolfgang Denk <wd@denx.de>2011-11-16 21:16:49 +0100
commit6d68621ceaca2513fefd7759dd3f7719e951e56a (patch)
treeee8b73eae16649e3aa632fd9f2c5e2f514237471 /nand_spl
parent13a8c8d0e97ecff486aab589b4f69acb795f0b2b (diff)
downloadu-boot-linaro-stable-6d68621ceaca2513fefd7759dd3f7719e951e56a.tar.gz
nand_boot.c: Fix GCC 4.6 build warnings
Fix: nand_boot.c: In function 'nand_read_page': nand_boot.c:190:6: warning: variable 'stat' set but not used [-Wunused-but-set-variable] nand_boot.c: In function 'nand_boot': nand_boot.c:271:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'nand_spl')
-rw-r--r--nand_spl/nand_boot.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 615ef258a..bee102950 100644
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -187,7 +187,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;
nand_command(mtd, block, page, 0, NAND_CMD_READ0);
@@ -217,7 +216,7 @@ static int nand_read_page(struct mtd_info *mtd, int block, int page, uchar *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;
@@ -268,7 +267,6 @@ void nand_boot(void)
{
struct nand_chip nand_chip;
nand_info_t nand_info;
- int ret;
__attribute__((noreturn)) void (*uboot)(void);
/*
@@ -287,8 +285,8 @@ void nand_boot(void)
/*
* Load U-Boot image from NAND into RAM
*/
- ret = nand_load(&nand_info, CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE,
- (uchar *)CONFIG_SYS_NAND_U_BOOT_DST);
+ nand_load(&nand_info, CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE,
+ (uchar *)CONFIG_SYS_NAND_U_BOOT_DST);
#ifdef CONFIG_NAND_ENV_DST
nand_load(&nand_info, CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,