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>
This commit is contained in:
Marcel Ziswiler 2008-06-22 16:13:46 +02:00 committed by Scott Wood
parent 3167c5386e
commit 99c2b434d3

View File

@ -95,8 +95,8 @@ uchar env_get_char_spec (int index)
/* this is called before nand_init() /* this is called before nand_init()
* so we can't read Nand to validate env data. * so we can't read Nand to validate env data.
* Mark it OK for now. env_relocate() in env_common.c * Mark it OK for now. env_relocate() in env_common.c
* will call our relocate function which will does * will call our relocate function which does the real
* the real validation. * validation.
* *
* When using a NAND boot image (like sequoia_nand), the environment * 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 * 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... "); puts ("Writing to Nand... ");
total = CFG_ENV_SIZE; total = CFG_ENV_SIZE;
if (writeenv(CFG_ENV_OFFSET, env_ptr)) { if (writeenv(CFG_ENV_OFFSET, (u_char *) env_ptr)) {
puts("FAILED!\n"); puts("FAILED!\n");
return 1; return 1;
} }
@ -349,7 +349,7 @@ void env_relocate_spec (void)
int ret; int ret;
total = CFG_ENV_SIZE; 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) if (ret || total != CFG_ENV_SIZE)
return use_default(); return use_default();