]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
nand_boot.c: Fix GCC 4.6 build warnings
authorStefan Roese <sr@denx.de>
Tue, 15 Nov 2011 08:02:54 +0000 (08:02 +0000)
committerWolfgang Denk <wd@denx.de>
Wed, 16 Nov 2011 20:16:49 +0000 (21:16 +0100)
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>
nand_spl/nand_boot.c

index 615ef258a8c6e5715398d587ce71d65abf4c884d..bee102950adfc16add8563f4c0a68db272250d23 100644 (file)
@@ -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,