random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with /home/stefan/git/u-boot/denx-merge-sr

Browse Source
This commit is contained in:
Stefan Roese 2007-02-21 12:54:04 +01:00
commit eb41db6d22
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
board/mcc200/auto_update.c
View File

@ -96,20 +96,20 @@ char *aufile[AU_MAXFILES] = {
long ausize[AU_MAXFILES] = { long ausize[AU_MAXFILES] = {
(AU_FL_FIRMWARE_ND + 1) - AU_FL_FIRMWARE_ST, (AU_FL_FIRMWARE_ND + 1) - AU_FL_FIRMWARE_ST,
(AU_FL_KERNEL_ND + 1) - AU_FL_KERNEL_ST, (AU_FL_KERNEL_ND + 1) - AU_FL_KERNEL_ST,
(AU_FL_ROOTFS_ND + 1) - AU_FL_ROOTFS_ST (AU_FL_ROOTFS_ND + 1) - AU_FL_ROOTFS_ST,
}; };
/* array of flash areas start and end addresses */ /* array of flash areas start and end addresses */
struct flash_layout aufl_layout[AU_MAXFILES] = { struct flash_layout aufl_layout[AU_MAXFILES] = {
{AU_FL_FIRMWARE_ST, AU_FL_FIRMWARE_ND,}, { AU_FL_FIRMWARE_ST, AU_FL_FIRMWARE_ND, },
{AU_FL_KERNEL_ST, AU_FL_KERNEL_ND,}, { AU_FL_KERNEL_ST, AU_FL_KERNEL_ND, },
{AU_FL_ROOTFS_ST, AU_FL_ROOTFS_ND,} { AU_FL_ROOTFS_ST, AU_FL_ROOTFS_ND, },
}; };
/* where to load files into memory */ /* where to load files into memory */
#define LOAD_ADDR ((unsigned char *)0x00200000) #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] #define MAX_LOADSZ ausize[IDX_ROOTFS]
/*i2c address of the keypad status*/ /*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]); printf ("Image %s wrong type\n", aufile[idx]);
return -1; 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]); printf ("Image %s wrong type\n", aufile[idx]);
return -1; return -1;
} }
@ -276,9 +278,9 @@ int au_do_update(int idx, long sz)
return -1; 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)) { 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; return -1;
} }