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

Delay FIT format check on sector based devices

Browse Source 
Global FIT image operations like format check cannot be performed on
a first sector data, defer them to the point when whole FIT image was
uploaded to a system RAM.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Partial ('cmd_nand' case) Acked-by: Grant Erickson <gerickson@nuovations.com>
NAND and DOC bits Acked-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Marian Balakowicz 2008-06-06 23:07:40 +02:00 committed by Wolfgang Denk
parent 9810263afe
commit 3bab76a26e
6 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/cmd_doc.c
View File

@ -206,7 +206,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
image_header_t *hdr; image_header_t *hdr;
int rcode = 0; int rcode = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
show_boot_progress (34); show_boot_progress (34);
@ -275,12 +275,6 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
show_boot_progress (-130);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (131);
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
cnt = fit_get_size (fit_hdr); cnt = fit_get_size (fit_hdr);
@ -304,8 +298,15 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
show_boot_progress (-130);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (131);
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */

15
common/cmd_fdc.c
View File

@ -787,7 +787,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *ep; char *ep;
int rcode = 0; int rcode = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
switch (argc) { switch (argc) {
@ -847,10 +847,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
puts ("** Bad FIT image format\n");
return 1;
}
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
imsize = fit_get_size (fit_hdr); imsize = fit_get_size (fit_hdr);
@ -879,8 +875,13 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
puts ("** Bad FIT image format\n");
return 1;
}
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */

19
common/cmd_ide.c
View File

@ -367,7 +367,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
image_header_t *hdr; image_header_t *hdr;
int rcode = 0; int rcode = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
show_boot_progress (41); show_boot_progress (41);
@ -465,12 +465,6 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
show_boot_progress (-140);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (141);
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
cnt = fit_get_size (fit_hdr); cnt = fit_get_size (fit_hdr);
@ -496,8 +490,15 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
show_boot_progress (-140);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (141);
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */

38
common/cmd_nand.c
View File

@ -484,7 +484,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
image_header_t *hdr; image_header_t *hdr;
int jffs2 = 0; int jffs2 = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
s = strchr(cmd, '.'); s = strchr(cmd, '.');
@ -526,12 +526,6 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
show_boot_progress (-150);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (151);
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
cnt = fit_get_size (fit_hdr); cnt = fit_get_size (fit_hdr);
@ -564,8 +558,15 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
show_boot_progress (-150);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (151);
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */
@ -952,7 +953,7 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
image_header_t *hdr; image_header_t *hdr;
int rcode = 0; int rcode = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
show_boot_progress (52); show_boot_progress (52);
@ -1021,12 +1022,6 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
show_boot_progress (-150);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (151);
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
cnt = fit_get_size (fit_hdr); cnt = fit_get_size (fit_hdr);
@ -1050,8 +1045,15 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
show_boot_progress (-150);
puts ("** Bad FIT image format\n");
return 1;
}
show_boot_progress (151);
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */

15
common/cmd_scsi.c
View File

@ -212,7 +212,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
image_header_t *hdr; image_header_t *hdr;
int rcode = 0; int rcode = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
switch (argc) { switch (argc) {
@ -291,10 +291,6 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
puts ("** Bad FIT image format\n");
return 1;
}
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
cnt = fit_get_size (fit_hdr); cnt = fit_get_size (fit_hdr);
@ -317,8 +313,13 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
puts ("** Bad FIT image format\n");
return 1;
}
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */

15
common/cmd_usb.c
View File

@ -316,7 +316,7 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
image_header_t *hdr; image_header_t *hdr;
block_dev_desc_t *stor_dev; block_dev_desc_t *stor_dev;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr; const void *fit_hdr = NULL;
#endif #endif
switch (argc) { switch (argc) {
@ -404,10 +404,6 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
fit_hdr = (const void *)addr; fit_hdr = (const void *)addr;
if (!fit_check_format (fit_hdr)) {
puts ("** Bad FIT image format\n");
return 1;
}
puts ("Fit image detected...\n"); puts ("Fit image detected...\n");
cnt = fit_get_size (fit_hdr); cnt = fit_get_size (fit_hdr);
@ -430,8 +426,13 @@ int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
/* This cannot be done earlier, we need complete FIT image in RAM first */ /* This cannot be done earlier, we need complete FIT image in RAM first */
if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
fit_print_contents ((const void *)addr); if (!fit_check_format (fit_hdr)) {
puts ("** Bad FIT image format\n");
return 1;
}
fit_print_contents (fit_hdr);
}
#endif #endif
/* Loading ok, update default load address */ /* Loading ok, update default load address */