diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-08 19:54:13 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-08 19:54:13 (GMT) |
| commit | 4b6f394fc41d7aee40467c30807b5ea03e2f6649 (patch) | |
| tree | ebf219811d5aecaf9db92ebe5b09c5f246d67bfc /drivers/mtd/nand/nand_spl_load.c | |
| parent | 3073abdd6af53b9da88cd9a47fc9f7ce65fd20ea (diff) | |
| parent | 40a0682d4ae69bdd8b6aa10b6dcb57a489ae875c (diff) | |
| download | u-boot-4b6f394fc41d7aee40467c30807b5ea03e2f6649.tar.xz | |
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/mtd/nand/nand_spl_load.c')
| -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 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 |