Reimplement environment. Now we only have one crc for the whole image.

1 files changed, 6 insertions, 4 deletions

diff --git a/include/envfs.h b/include/envfs.h
index bc043c9bbb..6f12342834 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -7,10 +7,9 @@
 #define ENVFS_SIGNATURE	"U-Boot envfs"
 
 struct envfs_inode {
-	uint32_t magic;	/* 0x67a8c78d */
-	uint32_t crc;	/* crc for this inode and corresponding data */
+	uint32_t magic;	/* ENVFS_INODE_MAGIC */
 	uint32_t size;	/* data size in bytes  */
-	uint32_t namelen; /* The length of the filename _including_ the trailing 0 */
+	uint32_t namelen; /* The length of the filename _including_ a trailing 0 */
 	char data[0];	/* The filename (zero terminated) + padding to 4 byte boundary
 			 * followed by the data for this inode.
 			 * The next inode follows after the data + padding to 4 byte
@@ -22,10 +21,13 @@ struct envfs_inode {
  * Superblock information at the beginning of the FS.
  */
 struct envfs_super {
-	uint32_t magic;			/* 0x798fba79 - random number */
+	uint32_t magic;			/* ENVFS_MAGIC */
 	uint32_t priority;
+	uint32_t crc;			/* crc for the data */
+	uint32_t size;			/* size of data */
 	uint32_t flags;			/* feature flags */
 	uint32_t future;		/* reserved for future use */
+	uint32_t sb_crc;		/* crc for the superblock */
 };
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN