summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordirk.behme@googlemail.com <dirk.behme@googlemail.com>2008-04-30 18:02:59 +0200
committerWolfgang Denk <wd@denx.de>2008-04-30 22:34:42 +0200
commit378e7ec95da4751ec8fe461baacab2bf7d2512a9 (patch)
treec72e41533b6635e2986ca82caa4ec969fecafaa6
parent33a4a70d48d622cc4950c60a84fec23b9421f23e (diff)
downloadu-boot-imx-378e7ec95da4751ec8fe461baacab2bf7d2512a9.zip
u-boot-imx-378e7ec95da4751ec8fe461baacab2bf7d2512a9.tar.gz
u-boot-imx-378e7ec95da4751ec8fe461baacab2bf7d2512a9.tar.bz2
Fix warning in env_nand.c if compiled for DaVinci Schmoogie
Fix warnings nv_nand.c: In function 'saveenv': env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type env_nand.c: In function 'env_relocate_spec': env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type if compiled for davinci_schmoogie_config. Signed-off-by: Dirk Behme <dirk.behme@gmail.com> Ack by: Sergey Kubushyn <ksi@koi8.net>
-rw-r--r--common/env_nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/env_nand.c b/common/env_nand.c
index 0dddddf..49742f5 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -102,7 +102,7 @@ uchar env_get_char_spec (int index)
int env_init(void)
{
#if defined(ENV_IS_EMBEDDED)
- ulong total;
+ size_t total;
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
@@ -188,7 +188,7 @@ int saveenv(void)
#else /* ! CFG_ENV_OFFSET_REDUND */
int saveenv(void)
{
- ulong total;
+ size_t total;
int ret = 0;
puts ("Erasing Nand...");
@@ -268,7 +268,7 @@ void env_relocate_spec (void)
void env_relocate_spec (void)
{
#if !defined(ENV_IS_EMBEDDED)
- ulong total;
+ size_t total;
int ret;
total = CFG_ENV_SIZE;