diff options
| author | Anatolij Gustschin <agust@denx.de> | 2011-12-03 06:46:09 +0000 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-12-07 16:02:07 -0600 |
| commit | b7fde587bfc31e45fe17e49ddd83d57cf1720b67 (patch) | |
| tree | 1e986d2f437a4adcdc5bb89456b89bb30e20fc49 /drivers/mtd/nand | |
| parent | 18b89072f6194411517597678d680255ee94a7b2 (diff) | |
| download | blackbird-obmc-uboot-b7fde587bfc31e45fe17e49ddd83d57cf1720b67.tar.gz blackbird-obmc-uboot-b7fde587bfc31e45fe17e49ddd83d57cf1720b67.zip | |
drivers/mtd/nand/nand_spl_load.c: Fix GCC 4.6 warning
Fix:
nand_spl_load.c: In function 'nand_boot':
nand_spl_load.c:31:6: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Acked-by: Heiko Schocher <hs@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/nand_spl_load.c | 13 |
1 files changed, 6 insertions, 7 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 |
