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

bootstage: Convert progress numbers 10-19 to enums

Browse Source 
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Simon Glass 2011-12-10 11:07:57 +00:00 committed by Wolfgang Denk
parent 5dc887164e
commit 5e41088364
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/bf533-stamp/bf533-stamp.c
View File

@ -112,11 +112,11 @@ void show_boot_progress(int status)
stamp_led_set(STATUS_LED_ON, STATUS_LED_ON, STATUS_LED_OFF); stamp_led_set(STATUS_LED_ON, STATUS_LED_ON, STATUS_LED_OFF);
break; break;
case BOOTSTAGE_ID_BOOT_OS_RETURNED: case BOOTSTAGE_ID_BOOT_OS_RETURNED:
case 10: case BOOTSTAGE_ID_RD_MAGIC:
case 11: case BOOTSTAGE_ID_RD_HDR_CHECKSUM:
case 12: case BOOTSTAGE_ID_RD_CHECKSUM:
case 13: case BOOTSTAGE_ID_RAMDISK:
case 14: case BOOTSTAGE_ID_NO_RAMDISK:
case BOOTSTAGE_ID_RUN_OS: case BOOTSTAGE_ID_RUN_OS:
stamp_led_set(STATUS_LED_OFF, STATUS_LED_OFF, STATUS_LED_OFF); stamp_led_set(STATUS_LED_OFF, STATUS_LED_OFF, STATUS_LED_OFF);
break; break;

2
board/matrix_vision/mvbc_p/mvbc_p.c
View File

@ -247,7 +247,7 @@ void show_boot_progress(int val)
case 65: case 65:
setbits_be32(&gpio->simple_dvo, LED_G1); setbits_be32(&gpio->simple_dvo, LED_G1);
break; break;
case 12: case BOOTSTAGE_ID_COPY_RAMDISK:
setbits_be32(&gpio->simple_dvo, LED_Y); setbits_be32(&gpio->simple_dvo, LED_Y);
break; break;
case BOOTSTAGE_ID_RUN_OS: case BOOTSTAGE_ID_RUN_OS:

20
common/image.c
View File

@ -373,37 +373,37 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
if (!image_check_magic(rd_hdr)) { if (!image_check_magic(rd_hdr)) {
puts("Bad Magic Number\n"); puts("Bad Magic Number\n");
show_boot_error(10); show_boot_error(BOOTSTAGE_ID_RD_MAGIC);
return NULL; return NULL;
} }
if (!image_check_hcrc(rd_hdr)) { if (!image_check_hcrc(rd_hdr)) {
puts("Bad Header Checksum\n"); puts("Bad Header Checksum\n");
show_boot_error(11); show_boot_error(BOOTSTAGE_ID_RD_HDR_CHECKSUM);
return NULL; return NULL;
} }
show_boot_progress(10); show_boot_progress(BOOTSTAGE_ID_RD_MAGIC);
image_print_contents(rd_hdr); image_print_contents(rd_hdr);
if (verify) { if (verify) {
puts(" Verifying Checksum ... "); puts(" Verifying Checksum ... ");
if (!image_check_dcrc(rd_hdr)) { if (!image_check_dcrc(rd_hdr)) {
puts("Bad Data CRC\n"); puts("Bad Data CRC\n");
show_boot_error(12); show_boot_error(BOOTSTAGE_ID_RD_CHECKSUM);
return NULL; return NULL;
} }
puts("OK\n"); puts("OK\n");
} }
show_boot_progress(11); show_boot_progress(BOOTSTAGE_ID_RD_HDR_CHECKSUM);
if (!image_check_os(rd_hdr, IH_OS_LINUX) || if (!image_check_os(rd_hdr, IH_OS_LINUX) ||
!image_check_arch(rd_hdr, arch) || !image_check_arch(rd_hdr, arch) ||
!image_check_type(rd_hdr, IH_TYPE_RAMDISK)) { !image_check_type(rd_hdr, IH_TYPE_RAMDISK)) {
printf("No Linux %s Ramdisk Image\n", printf("No Linux %s Ramdisk Image\n",
genimg_get_arch_name(arch)); genimg_get_arch_name(arch));
show_boot_error(13); show_boot_error(BOOTSTAGE_ID_RAMDISK);
return NULL; return NULL;
} }
@ -895,7 +895,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
printf("## Loading init Ramdisk from Legacy " printf("## Loading init Ramdisk from Legacy "
"Image at %08lx ...\n", rd_addr); "Image at %08lx ...\n", rd_addr);
show_boot_progress(BOOTSTAGE_ID_LOAD_RAMDISK); show_boot_progress(BOOTSTAGE_ID_CHECK_RAMDISK);
rd_hdr = image_get_ramdisk(rd_addr, arch, rd_hdr = image_get_ramdisk(rd_addr, arch,
images->verify); images->verify);
@ -1002,7 +1002,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
* Now check if we have a legacy mult-component image, * Now check if we have a legacy mult-component image,
* get second entry data start address and len. * get second entry data start address and len.
*/ */
show_boot_progress(13); show_boot_progress(BOOTSTAGE_ID_RAMDISK);
printf("## Loading init Ramdisk from multi component " printf("## Loading init Ramdisk from multi component "
"Legacy Image at %08lx ...\n", "Legacy Image at %08lx ...\n",
(ulong)images->legacy_hdr_os); (ulong)images->legacy_hdr_os);
@ -1012,7 +1012,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
/* /*
* no initrd image * no initrd image
*/ */
show_boot_progress(14); show_boot_progress(BOOTSTAGE_ID_NO_RAMDISK);
rd_len = rd_data = 0; rd_len = rd_data = 0;
} }
@ -1096,7 +1096,7 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
puts("ramdisk - allocation error\n"); puts("ramdisk - allocation error\n");
goto error; goto error;
} }
show_boot_progress(12); show_boot_progress(BOOTSTAGE_ID_COPY_RAMDISK);
*initrd_end = *initrd_start + rd_len; *initrd_end = *initrd_start + rd_len;
printf(" Loading Ramdisk to %08lx, end %08lx ... ", printf(" Loading Ramdisk to %08lx, end %08lx ... ",

7
include/bootstage.h
View File

@ -58,6 +58,13 @@ enum bootstage_id {
BOOTSTAGE_ID_BOOT_OS_RETURNED, /* Tried to boot OS, but it returned */ BOOTSTAGE_ID_BOOT_OS_RETURNED, /* Tried to boot OS, but it returned */
BOOTSTAGE_ID_CHECK_RAMDISK = 9, /* Checking ram disk */ BOOTSTAGE_ID_CHECK_RAMDISK = 9, /* Checking ram disk */
BOOTSTAGE_ID_RD_MAGIC, /* Checking ram disk magic */
BOOTSTAGE_ID_RD_HDR_CHECKSUM, /* Checking ram disk heder checksum */
BOOTSTAGE_ID_RD_CHECKSUM, /* Checking ram disk checksum */
BOOTSTAGE_ID_COPY_RAMDISK = 12, /* Copying ram disk into place */
BOOTSTAGE_ID_RAMDISK, /* Checking for valid ramdisk */
BOOTSTAGE_ID_NO_RAMDISK, /* No ram disk found (not an error) */
BOOTSTAGE_ID_RUN_OS = 15, /* Exiting U-Boot, entering OS */ BOOTSTAGE_ID_RUN_OS = 15, /* Exiting U-Boot, entering OS */
}; };