aboutsummaryrefslogtreecommitdiff
path: root/common/env_nand.c
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel@ziswiler.com>2008-06-22 16:13:46 +0200
committerScott Wood <scottwood@freescale.com>2008-07-09 17:24:47 -0500
commit99c2b434d37863df5dda5207a53760c6506fc2be (patch)
tree169f8025d06e1c6d4865d64e8a6dd41e119d680b /common/env_nand.c
parent3167c5386ea1c98b638be5d8763ef6d5938ef1bd (diff)
downloadu-boot-linaro-natty-99c2b434d37863df5dda5207a53760c6506fc2be.tar.gz
NAND: Fix warning due to missing env_ptr casts to u_char * in env_nand.c.
The writeenv() and readenv() calls introduced by the recently added bad block management for environment variables were missing casts therefore producing compile time warnings. While at it fixing some typo in a comment and indentation. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'common/env_nand.c')
-rw-r--r--common/env_nand.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/env_nand.c b/common/env_nand.c
index 895401770..1fe874a6a 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -95,8 +95,8 @@ uchar env_get_char_spec (int index)
/* this is called before nand_init()
* so we can't read Nand to validate env data.
* Mark it OK for now. env_relocate() in env_common.c
- * will call our relocate function which will does
- * the real validation.
+ * will call our relocate function which does the real
+ * validation.
*
* When using a NAND boot image (like sequoia_nand), the environment
* can be embedded or attached to the U-Boot image in NAND flash. This way
@@ -246,7 +246,7 @@ int saveenv(void)
puts ("Writing to Nand... ");
total = CFG_ENV_SIZE;
- if (writeenv(CFG_ENV_OFFSET, env_ptr)) {
+ if (writeenv(CFG_ENV_OFFSET, (u_char *) env_ptr)) {
puts("FAILED!\n");
return 1;
}
@@ -349,7 +349,7 @@ void env_relocate_spec (void)
int ret;
total = CFG_ENV_SIZE;
- ret = readenv(CFG_ENV_OFFSET, env_ptr);
+ ret = readenv(CFG_ENV_OFFSET, (u_char *) env_ptr);
if (ret || total != CFG_ENV_SIZE)
return use_default();