From 378e7ec95da4751ec8fe461baacab2bf7d2512a9 Mon Sep 17 00:00:00 2001 From: "dirk.behme@googlemail.com" Date: Wed, 30 Apr 2008 18:02:59 +0200 Subject: 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 Ack by: Sergey Kubushyn --- common/env_nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/env_nand.c b/common/env_nand.c index 0dddddf0a1f..49742f5bfb5 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; -- cgit v1.2.3 From 12bc4e94251c369c529ffa505cf58b148c372f7f Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 30 Apr 2008 22:38:17 +0200 Subject: cmd_nand: fix warning: str2long ncompatible pointer type Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/cmd_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 1a3c1df03e0..37eb41b20e6 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -110,7 +110,7 @@ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size } *off = part->offset; if (argc >= 2) { - if (!(str2long(argv[1], size))) { + if (!(str2long(argv[1], (ulong *)size))) { printf("'%s' is not a number\n", argv[1]); return -1; } -- cgit v1.2.3