linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

bootstage: Convert IDE progress numbers to enums

Browse Source 
This changes over the IDE progress numbers to use enums from bootstage.h.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2011-12-10 11:07:59 +00:00
committed by Wolfgang Denk
parent 8ade950638
commit 90e153d770
2 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
common/cmd_ide.c
View File

@ -345,7 +345,7 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
const void *fit_hdr = NULL; const void *fit_hdr = NULL;
#endif #endif
show_boot_progress(41); show_boot_progress(BOOTSTAGE_ID_IDE_START);
switch (argc) { switch (argc) {
case 1: case 1:
addr = CONFIG_SYS_LOAD_ADDR; addr = CONFIG_SYS_LOAD_ADDR;
@ -360,41 +360,43 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
boot_device = argv[2]; boot_device = argv[2];
break; break;
default: default:
show_boot_error(42); show_boot_error(BOOTSTAGE_ID_IDE_ADDR);
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }
show_boot_progress(42); show_boot_progress(BOOTSTAGE_ID_IDE_ADDR);
if (!boot_device) { if (!boot_device) {
puts("\n** No boot device **\n"); puts("\n** No boot device **\n");
show_boot_error(43); show_boot_error(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
return 1; return 1;
} }
show_boot_progress(43); show_boot_progress(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
dev = simple_strtoul(boot_device, &ep, 16); dev = simple_strtoul(boot_device, &ep, 16);
if (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN) { if (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN) {
printf("\n** Device %d not available\n", dev); printf("\n** Device %d not available\n", dev);
show_boot_error(44); show_boot_error(BOOTSTAGE_ID_IDE_TYPE);
return 1; return 1;
} }
show_boot_progress(44); show_boot_progress(BOOTSTAGE_ID_IDE_TYPE);
if (*ep) { if (*ep) {
if (*ep != ':') { if (*ep != ':') {
puts("\n** Invalid boot device, use `dev[:part]' **\n"); puts("\n** Invalid boot device, use `dev[:part]' **\n");
show_boot_error(45); show_boot_error(BOOTSTAGE_ID_IDE_PART);
return 1; return 1;
} }
part = simple_strtoul(++ep, NULL, 16); part = simple_strtoul(++ep, NULL, 16);
} }
show_boot_progress(45); show_boot_progress(BOOTSTAGE_ID_IDE_PART);
if (get_partition_info(&ide_dev_desc[dev], part, &info)) { if (get_partition_info(&ide_dev_desc[dev], part, &info)) {
show_boot_error(46); show_boot_error(BOOTSTAGE_ID_IDE_PART_INFO);
return 1; return 1;
} }
show_boot_progress(46); show_boot_progress(BOOTSTAGE_ID_IDE_PART_INFO);
if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0)
&& &&
(strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0) (strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)
@ -402,10 +404,10 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
printf("\n** Invalid partition type \"%.32s\"" " (expect \"" printf("\n** Invalid partition type \"%.32s\"" " (expect \""
BOOT_PART_TYPE "\")\n", BOOT_PART_TYPE "\")\n",
info.type); info.type);
show_boot_error(47); show_boot_error(BOOTSTAGE_ID_IDE_PART_TYPE);
return 1; return 1;
} }
show_boot_progress(47); show_boot_progress(BOOTSTAGE_ID_IDE_PART_TYPE);
printf("\nLoading from IDE device %d, partition %d: " printf("\nLoading from IDE device %d, partition %d: "
"Name: %.32s Type: %.32s\n", dev, part, info.name, info.type); "Name: %.32s Type: %.32s\n", dev, part, info.name, info.type);
@ -416,23 +418,23 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
if (ide_dev_desc[dev]. if (ide_dev_desc[dev].
block_read(dev, info.start, 1, (ulong *) addr) != 1) { block_read(dev, info.start, 1, (ulong *) addr) != 1) {
printf("** Read error on %d:%d\n", dev, part); printf("** Read error on %d:%d\n", dev, part);
show_boot_error(48); show_boot_error(BOOTSTAGE_ID_IDE_PART_READ);
return 1; return 1;
} }
show_boot_progress(48); show_boot_progress(BOOTSTAGE_ID_IDE_PART_READ);
switch (genimg_get_format((void *) addr)) { switch (genimg_get_format((void *) addr)) {
case IMAGE_FORMAT_LEGACY: case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *) addr; hdr = (image_header_t *) addr;
show_boot_progress(49); show_boot_progress(BOOTSTAGE_ID_IDE_FORMAT);
if (!image_check_hcrc(hdr)) { if (!image_check_hcrc(hdr)) {
puts("\n** Bad Header Checksum **\n"); puts("\n** Bad Header Checksum **\n");
show_boot_error(50); show_boot_error(BOOTSTAGE_ID_IDE_CHECKSUM);
return 1; return 1;
} }
show_boot_progress(50); show_boot_progress(BOOTSTAGE_ID_IDE_CHECKSUM);
image_print_contents(hdr); image_print_contents(hdr);
@ -447,7 +449,7 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
break; break;
#endif #endif
default: default:
show_boot_error(49); show_boot_error(BOOTSTAGE_ID_IDE_FORMAT);
puts("** Unknown image type\n"); puts("** Unknown image type\n");
return 1; return 1;
} }
@ -459,20 +461,20 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
if (ide_dev_desc[dev].block_read(dev, info.start + 1, cnt, if (ide_dev_desc[dev].block_read(dev, info.start + 1, cnt,
(ulong *)(addr + info.blksz)) != cnt) { (ulong *)(addr + info.blksz)) != cnt) {
printf("** Read error on %d:%d\n", dev, part); printf("** Read error on %d:%d\n", dev, part);
show_boot_error(51); show_boot_error(BOOTSTAGE_ID_IDE_READ);
return 1; return 1;
} }
show_boot_progress(51); show_boot_progress(BOOTSTAGE_ID_IDE_READ);
#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) {
if (!fit_check_format(fit_hdr)) { if (!fit_check_format(fit_hdr)) {
show_boot_error(140); show_boot_error(BOOTSTAGE_ID_IDE_FIT_READ);
puts("** Bad FIT image format\n"); puts("** Bad FIT image format\n");
return 1; return 1;
} }
show_boot_progress(141); show_boot_progress(BOOTSTAGE_ID_IDE_FIT_READ_OK);
fit_print_contents(fit_hdr); fit_print_contents(fit_hdr);
} }
#endif #endif

14
include/bootstage.h
View File

@ -91,6 +91,20 @@ enum bootstage_id {
BOOTSTAGE_ID_BOARD_DONE, /* Board init done, off to main loop */ BOOTSTAGE_ID_BOARD_DONE, /* Board init done, off to main loop */
/* ^^^ here ends the x86 sequence */ /* ^^^ here ends the x86 sequence */
/* Boot stages related to loading a kernel from an IDE device */
BOOTSTAGE_ID_IDE_START = 41,
BOOTSTAGE_ID_IDE_ADDR,
BOOTSTAGE_ID_IDE_BOOT_DEVICE,
BOOTSTAGE_ID_IDE_TYPE,
BOOTSTAGE_ID_IDE_PART,
BOOTSTAGE_ID_IDE_PART_INFO,
BOOTSTAGE_ID_IDE_PART_TYPE,
BOOTSTAGE_ID_IDE_PART_READ,
BOOTSTAGE_ID_IDE_FORMAT,
BOOTSTAGE_ID_IDE_CHECKSUM, /* 50 */
BOOTSTAGE_ID_IDE_READ,
}; };
/* /*