Scott,
Here is a new version of my patch to env_nand.c. Thanks for the good comments.
Fixed a problem with the new code that allowed it to read a
environment area even
if it contained a bad block after the good environment data.
diff --git a/common/env_nand.c b/common/env_nand.c
index 49742f5..3ee42e0 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -1,4 +1,7 @@
/*
+ * (C) Copywrite 2008
+ * Stuart Wood, Lab X Technologies <[EMAIL PROTECTED]>
+ *
* (C) Copyright 2004
* Jian Zhang, Texas Instruments, [EMAIL PROTECTED]
@@ -53,6 +56,10 @@
#error CONFIG_INFERNO not supported yet
#endif
+#ifndef CFG_ENV_RANGE
+#define CFG_ENV_RANGE CFG_ENV_SIZE
+#endif
+
int nand_legacy_rw (struct nand_chip* nand, int cmd,
size_t start, size_t len,
size_t * retlen, u_char * buf);
@@ -152,30 +159,57 @@ int env_init(void)
* nand_dev_desc + 0. This is also the behaviour using the new NAND code.
*/
#ifdef CFG_ENV_OFFSET_REDUND
+size_t erase_env(size_t offset)
+{
+ size_t end;
+
+ end = offset + CFG_ENV_RANGE;
+
+ while (offset < end && nand_erase(&nand_info[0],offset, CFG_ENV_SIZE))
+ offset += CFG_ENV_SIZE;
+
+ if (offset >= end)
+ return 0;
+
+ return offset;
+}
+
int saveenv(void)
{
size_t total;
+ size_t offset;
int ret = 0;
env_ptr->flags++;
total = CFG_ENV_SIZE;
+ if (CFG_ENV_RANGE < CFG_ENV_SIZE)
+ return 1;
if(gd->env_valid == 1) {
- puts ("Erasing redundant Nand...");
- if (nand_erase(&nand_info[0],
- CFG_ENV_OFFSET_REDUND, CFG_ENV_SIZE))
+ puts ("Erasing redundant Nand...\n");
+
+ offset = erase_env(CFG_ENV_OFFSET_REDUND);
+ if (offset == 0) {
+ puts ("Redundant Nand area is completely bad!\n");
+ gd->env_valid = 2;
return 1;
+ }
+
puts ("Writing to redundant Nand... ");
- ret = nand_write(&nand_info[0], CFG_ENV_OFFSET_REDUND, &total,
+ ret = nand_write(&nand_info[0], offset, &total,
(u_char*) env_ptr);
} else {
- puts ("Erasing Nand...");
- if (nand_erase(&nand_info[0],
- CFG_ENV_OFFSET, CFG_ENV_SIZE))
+ puts ("Erasing Nand...\n");
+
+ offset = erase_env(CFG_ENV_OFFSET);
+ if (offset == 0) {
+ puts ("Nand area is completely bad!\n");
+ gd->env_valid = 1;
return 1;
+ }
puts ("Writing to Nand... ");
- ret = nand_write(&nand_info[0], CFG_ENV_OFFSET, &total,
+ ret = nand_write(&nand_info[0], offset, &total,
(u_char*) env_ptr);
}
if (ret || total != CFG_ENV_SIZE)
@@ -189,15 +223,23 @@ int saveenv(void)
int saveenv(void)
{
size_t total;
+ size_t offset;
int ret = 0;
- puts ("Erasing Nand...");
- if (nand_erase(&nand_info[0], CFG_ENV_OFFSET, CFG_ENV_SIZE))
+ if (CFG_ENV_RANGE < CFG_ENV_SIZE)
return 1;
+ puts ("Erasing Nand...\n");
+
+ offset = erase_env(CFG_ENV_OFFSET);
+
+ if (offset == 0) {
+ puts ("Nand area is completely bad!\n");
+ return 1;
+ }
puts ("Writing to Nand... ");
total = CFG_ENV_SIZE;
- ret = nand_write(&nand_info[0], CFG_ENV_OFFSET, &total,
(u_char*)env_ptr);
+ ret = nand_write(&nand_info[0], offset, &total, (u_char*)env_ptr);
if (ret || total != CFG_ENV_SIZE)
return 1;
@@ -208,10 +250,26 @@ int saveenv(void)
#endif /* CMD_SAVEENV */
#ifdef CFG_ENV_OFFSET_REDUND
+int check_env_size (size_t offset)
+{
+ size_t end;
+ int ret_val = 0;
+ end = offset + CFG_ENV_SIZE;
+
+ for (; offset < end; offset += nand_info[0].erasesize) {
+ if (nand_block_isbad(&nand_info[0],offset))
+ ret_val = 1;
+ }
+
+ return ret_val;
+}
+
void env_relocate_spec (void)
{
#if !defined(ENV_IS_EMBEDDED)
size_t total;
+ size_t offset;
+ size_t end;
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
@@ -220,10 +278,27 @@ void env_relocate_spec (void)
tmp_env1 = (env_t *) malloc(CFG_ENV_SIZE);
tmp_env2 = (env_t *) malloc(CFG_ENV_SIZE);
- nand_read(&nand_info[0], CFG_ENV_OFFSET, &total,
- (u_char*) tmp_env1);
- nand_read(&nand_info[0], CFG_ENV_OFFSET_REDUND, &total,
- (u_char*) tmp_env2);
+ offset = CFG_ENV_OFFSET;
+ end = offset + CFG_ENV_RANGE;
+
+ while (offset < end && check_env_size(offset)) {
+ offset += CFG_ENV_SIZE;
+ }
+ if (offset >= end)
+ puts("No Valid Environment Area Found\n");
+ else
+ nand_read(&nand_info[0], offset, &total, (u_char*) tmp_env1);
+
+ offset = CFG_ENV_OFFSET_REDUND;
+ end = offset + CFG_ENV_RANGE;
+
+ while (offset < end && check_env_size(offset)) {
+ offset += CFG_ENV_SIZE;
+ }
+ if (offset >= end)
+ puts("No Valid Reundant Environment Area Found\n");
+ else
+ nand_read(&nand_info[0], offset, &total, (u_char*) tmp_env2);
crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
--
Stuart Wood
Lab X Technologies, LLC
176 Anderson Ave.
Suite 302
Rochester, NY 14607
Phone: (585) 271-7790 x207
Fax: (585) 473.4707
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
