Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / rpxsuper / flash.c

diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c
index 724ae88431a5cc0e1f3b5a384c32404e1a117642..70ae1d2ff93f8f897f1dcab5527db1903150ac98 100644 (file)
--- a/board/rpxsuper/flash.c
+++ b/board/rpxsuper/flash.c
@@ -49,7 +49,6 @@ static int write_word (flash_info_t *info, ulong dest, ulong data);
 
 unsigned long flash_init(void)
 {
-       unsigned long size;
        int i;
 
        /* Init: no FLASHes known */
@@ -57,7 +56,7 @@ unsigned long flash_init(void)
                flash_info[i].flash_id = FLASH_UNKNOWN;
 
        /* for now, only support the 4 MB Flash SIMM */
-       size = flash_get_size((vu_long *) CONFIG_SYS_FLASH0_BASE,
+       (void)flash_get_size((vu_long *) CONFIG_SYS_FLASH0_BASE,
                              &flash_info[0]);
 
        /*
@@ -80,7 +79,7 @@ unsigned long flash_init(void)
                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
 #endif
 
-       return /*size */ (CONFIG_SYS_FLASH0_SIZE * 1024 * 1024);
+       return CONFIG_SYS_FLASH0_SIZE * 1024 * 1024;
 }
 
 /*-----------------------------------------------------------------------