aboutsummaryrefslogtreecommitdiff
path: root/common/env_nand.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-10 00:59:04 +0200
committerWolfgang Denk <wd@denx.de>2008-07-10 00:59:04 +0200
commit40234535ee4ed8721cbc14414f65910fc83d81d0 (patch)
tree4fa164030d538526ed22908cf014c16b166a1897 /common/env_nand.c
parent8915f1189c1d29d8be7f4de325702d90a8988219 (diff)
parent9d2e3947b2944e5bb85b4335533f8c93c58445fe (diff)
downloadu-boot-linaro-natty-40234535ee4ed8721cbc14414f65910fc83d81d0.tar.gz
Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
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 3890b8494..104f0856a 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();