minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Accelerate booting on TRAB board: read and check autoupdate image

Browse Source 
headers first instead of always reading the whole images.
This commit is contained in:
wdenk 2003-12-06 11:20:01 +00:00
parent b96619a117
commit fa1399ed12
2 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -2,6 +2,9 @@
Changes since U-Boot 1.0.0: Changes since U-Boot 1.0.0:
====================================================================== ======================================================================
* Accelerate booting on TRAB board: read and check autoupdate image
headers first instead of always reading the whole images.
* Fix type in MPC5XXX code (pointed out by Victor Wren) * Fix type in MPC5XXX code (pointed out by Victor Wren)
* Enabled password check on RMU board * Enabled password check on RMU board

63
board/trab/auto_update.c
View File

@ -207,7 +207,32 @@ extern block_dev_desc_t *get_dev (char*, int);
extern int u_boot_hush_start(void); extern int u_boot_hush_start(void);
int int
au_check_valid(int idx, long nbytes) au_check_cksum_valid(int idx, long nbytes)
{
image_header_t *hdr;
unsigned long checksum;
hdr = (image_header_t *)LOAD_ADDR;
if (nbytes != (sizeof(*hdr) + ntohl(hdr->ih_size)))
{
printf ("Image %s bad total SIZE\n", aufile[idx]);
return -1;
}
/* check the data CRC */
checksum = ntohl(hdr->ih_dcrc);
if (crc32 (0, (char *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size))
!= checksum)
{
printf ("Image %s bad data checksum\n", aufile[idx]);
return -1;
}
return 0;
}
int
au_check_header_valid(int idx, long nbytes)
{ {
image_header_t *hdr; image_header_t *hdr;
unsigned long checksum; unsigned long checksum;
@ -222,11 +247,14 @@ au_check_valid(int idx, long nbytes)
printf("size %#x %#lx ", ntohl(hdr->ih_size), nbytes); printf("size %#x %#lx ", ntohl(hdr->ih_size), nbytes);
printf("type %#x %#x ", hdr->ih_type, IH_TYPE_KERNEL); printf("type %#x %#x ", hdr->ih_type, IH_TYPE_KERNEL);
#endif #endif
if (ntohl(hdr->ih_magic) != IH_MAGIC || if (nbytes < sizeof(*hdr))
hdr->ih_arch != IH_CPU_ARM ||
nbytes != (sizeof(*hdr) + ntohl(hdr->ih_size)))
{ {
printf ("Image %s bad MAGIC or ARCH or SIZE\n", aufile[idx]); printf ("Image %s bad header SIZE\n", aufile[idx]);
return -1;
}
if (ntohl(hdr->ih_magic) != IH_MAGIC || hdr->ih_arch != IH_CPU_ARM)
{
printf ("Image %s bad MAGIC or ARCH\n", aufile[idx]);
return -1; return -1;
} }
/* check the hdr CRC */ /* check the hdr CRC */
@ -238,15 +266,6 @@ au_check_valid(int idx, long nbytes)
return -1; return -1;
} }
hdr->ih_hcrc = htonl(checksum); hdr->ih_hcrc = htonl(checksum);
/* check the data CRC */
checksum = ntohl(hdr->ih_dcrc);
if (crc32 (0, (char *)(LOAD_ADDR + sizeof(*hdr)), ntohl(hdr->ih_size))
!= checksum)
{
printf ("Image %s bad data checksum\n", aufile[idx]);
return -1;
}
/* check the type - could do this all in one gigantic if() */ /* check the type - could do this all in one gigantic if() */
if ((idx == IDX_FIRMWARE) && (hdr->ih_type != IH_TYPE_FIRMWARE)) { if ((idx == IDX_FIRMWARE) && (hdr->ih_type != IH_TYPE_FIRMWARE)) {
printf ("Image %s wrong type\n", aufile[idx]); printf ("Image %s wrong type\n", aufile[idx]);
@ -548,6 +567,18 @@ do_auto_update(void)
bitmap_first = 0; bitmap_first = 0;
/* just loop thru all the possible files */ /* just loop thru all the possible files */
for (i = 0; i < AU_MAXFILES; i++) { for (i = 0; i < AU_MAXFILES; i++) {
/* just read the header */
sz = file_fat_read(aufile[i], LOAD_ADDR, sizeof(image_header_t));
debug ("read %s sz %ld hdr %d\n",
aufile[i], sz, sizeof(image_header_t));
if (sz <= 0 || sz < sizeof(image_header_t)) {
debug ("%s not found\n", aufile[i]);
continue;
}
if (au_check_header_valid(i, sz) < 0) {
debug ("%s header not valid\n", aufile[i]);
continue;
}
sz = file_fat_read(aufile[i], LOAD_ADDR, MAX_LOADSZ); sz = file_fat_read(aufile[i], LOAD_ADDR, MAX_LOADSZ);
debug ("read %s sz %ld hdr %d\n", debug ("read %s sz %ld hdr %d\n",
aufile[i], sz, sizeof(image_header_t)); aufile[i], sz, sizeof(image_header_t));
@ -555,8 +586,8 @@ do_auto_update(void)
debug ("%s not found\n", aufile[i]); debug ("%s not found\n", aufile[i]);
continue; continue;
} }
if (au_check_valid(i, sz) < 0) { if (au_check_cksum_valid(i, sz) < 0) {
debug ("%s not valid\n", aufile[i]); debug ("%s checksum not valid\n", aufile[i]);
continue; continue;
} }
#ifdef CONFIG_VFD #ifdef CONFIG_VFD