summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-02-21 12:53:28 +0100
committerStefan Roese <sr@denx.de>2007-02-21 12:53:28 +0100
commit958de0e22e408eadeffedcc130f69899c95de7c8 (patch)
treefbfea710c9c06a136ea30c44a9094e2f47b78ac1
parenteb867a76238fb38e952c37871b16d0d7fd61c95f (diff)
parentf5fcc3c20b65554e98a165542c36ee0c610a2d81 (diff)
downloadu-boot-imx-958de0e22e408eadeffedcc130f69899c95de7c8.zip
u-boot-imx-958de0e22e408eadeffedcc130f69899c95de7c8.tar.gz
u-boot-imx-958de0e22e408eadeffedcc130f69899c95de7c8.tar.bz2
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
-rw-r--r--board/mcc200/auto_update.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index df003fe..9ccda72 100644
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -95,21 +95,21 @@ char *aufile[AU_MAXFILES] = {
/* sizes of flash areas for each file */
long ausize[AU_MAXFILES] = {
(AU_FL_FIRMWARE_ND + 1) - AU_FL_FIRMWARE_ST,
- (AU_FL_KERNEL_ND + 1) - AU_FL_KERNEL_ST,
- (AU_FL_ROOTFS_ND + 1) - AU_FL_ROOTFS_ST
+ (AU_FL_KERNEL_ND + 1) - AU_FL_KERNEL_ST,
+ (AU_FL_ROOTFS_ND + 1) - AU_FL_ROOTFS_ST,
};
/* array of flash areas start and end addresses */
struct flash_layout aufl_layout[AU_MAXFILES] = {
- {AU_FL_FIRMWARE_ST, AU_FL_FIRMWARE_ND,},
- {AU_FL_KERNEL_ST, AU_FL_KERNEL_ND,},
- {AU_FL_ROOTFS_ST, AU_FL_ROOTFS_ND,}
+ { AU_FL_FIRMWARE_ST, AU_FL_FIRMWARE_ND, },
+ { AU_FL_KERNEL_ST, AU_FL_KERNEL_ND, },
+ { AU_FL_ROOTFS_ST, AU_FL_ROOTFS_ND, },
};
/* where to load files into memory */
#define LOAD_ADDR ((unsigned char *)0x00200000)
-/* the app is the largest image */
+/* the root file system is the largest image */
#define MAX_LOADSZ ausize[IDX_ROOTFS]
/*i2c address of the keypad status*/
@@ -192,7 +192,9 @@ int au_check_header_valid(int idx, long nbytes)
printf ("Image %s wrong type\n", aufile[idx]);
return -1;
}
- if ((idx == IDX_ROOTFS) && (hdr->ih_type != IH_TYPE_RAMDISK)) {
+ if ((idx == IDX_ROOTFS) &&
+ ( (hdr->ih_type != IH_TYPE_RAMDISK) || (hdr->ih_type != IH_TYPE_FILESYSTEM) )
+ ) {
printf ("Image %s wrong type\n", aufile[idx]);
return -1;
}
@@ -276,9 +278,9 @@ int au_do_update(int idx, long sz)
return -1;
}
- /* check the dcrc of the copy */
+ /* check the data CRC of the copy */
if (crc32 (0, (uchar *)(start + off), ntohl(hdr->ih_size)) != ntohl(hdr->ih_dcrc)) {
- printf ("Image %s Bad Data Checksum After COPY\n", aufile[idx]);
+ printf ("Image %s Bad Data Checksum after COPY\n", aufile[idx]);
return -1;
}