--- embedtools/src/ub_env.c	2014/01/29 10:19:48	1.1.2.11
+++ embedtools/src/ub_env.c	2014/01/29 14:01:06	1.1.2.16
@@ -4,22 +4,27 @@
 
 env_t *env;
 
-
 static int
 ub_flash_io(const char *csSec, int mode)
 {
 	int f, l, rlen;
 	const char *str;
-	size_t siz;
+	ssize_t siz, esiz;
 	ait_val_t v;
+	u_int crc;
 
 	FTRACE(4);
 
-	str = cfg_getAttribute(&cfg, csSec, "size");
+	str = cfg_getAttribute(&cfg, csSec, "drive_size");
 	siz = strtol(str, NULL, 0);
 	if (!siz)
 		return -1;
-	str = cfg_getAttribute(&cfg, csSec, "drive");
+	str = cfg_getAttribute(&cfg, csSec, "env_size");
+	if (!str)
+		esiz = siz - sizeof env->env_crc;
+	else
+		esiz = strtol(str, NULL, 0);
+	str = cfg_getAttribute(&cfg, csSec, "drive_name");
 	if (!str) {
 		printf("Error:: drive not found!\n");
 		return -1;
@@ -43,6 +48,8 @@ ub_flash_io(const char *csSec, int mode)
 	}
 
 	if (mode & O_RDWR) {
+		env->env_crc = crc32(0, (u_char*) env->env_data, esiz);
+		VERB(5) printf("Write CRC32 0x%x\n", env->env_crc);
 		rlen = write(f, env, siz);
 		if (rlen != siz)
 			printf("Error:: written %d bytes != %d\n", rlen, siz);
@@ -57,6 +64,12 @@ ub_flash_io(const char *csSec, int mode)
 	else
 		VERB(3) printf("Readed %d bytes\n", rlen);
 
+	crc = crc32(0, (u_char*) env->env_data, esiz);
+	VERB(5) printf("Calculated CRC32 0x%x\n", crc);
+	if (crc != env->env_crc)
+		VERB(1) printf("Warning:: Bad CRC, Flash crc32 0x%x != 0x%x\n", 
+				env->env_crc, crc);
+
 	close(f);
 	close(l);
 	unlink(AIT_GET_STR(&v));
@@ -84,7 +97,7 @@ ub_load(const char *csSec)
 
 	FTRACE(4);
 
-	str = cfg_getAttribute(&cfg, csSec, "size");
+	str = cfg_getAttribute(&cfg, csSec, "drive_size");
 	siz = strtol(str, NULL, 0);
 	if (!siz)
 		return -1;
@@ -111,15 +124,19 @@ const char*
 ub_getenv(const char *csSec, const char *csName)
 {
 	char *e, *nxt;
-	size_t dlen;
+	size_t dlen = 0;
 	const char *str = NULL;
 
 	FTRACE(3);
 
-	str = cfg_getAttribute(&cfg, csSec, "size");
-	if (!str)
-		return NULL;
-	dlen = strtol(str, NULL, 0);
+	str = cfg_getAttribute(&cfg, csSec, "env_size");
+	if (!str) {
+		str = cfg_getAttribute(&cfg, csSec, "drive_size");
+		if (!str)
+			return NULL;
+		dlen -= sizeof env->env_crc;
+	}
+	dlen += strtol(str, NULL, 0);
 	if (!dlen)
 		return NULL;
 	else
@@ -144,15 +161,19 @@ int
 ub_setenv(const char *csSec, const char *csName, const char *csValue)
 {
 	char *e, *nxt;
-	size_t dlen, len;
+	ssize_t dlen = 0, len;
 	const char *str, *old = NULL;
 
 	FTRACE(3);
 
-	str = cfg_getAttribute(&cfg, csSec, "size");
-	if (!str)
-		return -1;
-	dlen = strtol(str, NULL, 0);
+	str = cfg_getAttribute(&cfg, csSec, "env_size");
+	if (!str) {
+		str = cfg_getAttribute(&cfg, csSec, "drive_size");
+		if (!str)
+			return -1;
+		dlen -= sizeof env->env_crc;
+	}
+	dlen += strtol(str, NULL, 0);
 	if (!dlen)
 		return -1;
 	else
@@ -189,7 +210,7 @@ ub_setenv(const char *csSec, const char *csName, const
 		for (e = env->env_data; *e || *(e + 1); e++);
 		if (e > env->env_data)
 			e++;
-		/* "name" + "=" + "val" +"\0\0"  > u-boot-env size */
+		/* "name" + "=" + "val" +"\0\0" check u-boot-env size */
 		len = strlen(csName) + 2; /* add '=' for first arg, ' ' for all others */
 		len += strlen(csValue) + 1;
 		if (len > env->env_data + dlen - e) {
@@ -219,15 +240,19 @@ int
 ub_env(const char *csSec)
 {
 	char *e, *nxt;
-	size_t dlen;
+	ssize_t dlen = 0;
 	const char *str;
 
 	FTRACE(3);
 
-	str = cfg_getAttribute(&cfg, csSec, "size");
-	if (!str)
-		return -1;
-	dlen = strtol(str, NULL, 0);
+	str = cfg_getAttribute(&cfg, csSec, "env_size");
+	if (!str) {
+		str = cfg_getAttribute(&cfg, csSec, "drive_size");
+		if (!str)
+			return -1;
+		dlen -= sizeof env->env_crc;
+	}
+	dlen += strtol(str, NULL, 0);
 	if (!dlen)
 		return -1;
 	else