leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress()

Browse Source 
This changes the number 15 as used in boot_stage_progress() to use the
new name provided for it. This is a separate patch because it touches
so many files.

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:54 +00:00 committed by Wolfgang Denk
parent 097e17836d
commit 578ac1e9ba
16 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/lib/bootm.c
View File

@ -113,7 +113,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
printf ("Using machid 0x%x from environment\n", machid);
}
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
#ifdef CONFIG_OF_LIBFDT
if (images->ft_len)

2
arch/avr32/lib/bootm.c
View File

@ -192,7 +192,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
theKernel = (void *)images->ep;
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
params = params_start = (struct tag *)gd->bd->bi_boot_params;
params = setup_start_tag(params);

2
arch/m68k/lib/bootm.c
View File

@ -104,7 +104,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
debug("## Transferring control to Linux (at address %08lx) ...\n",
(ulong) kernel);
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
/*
* Linux Kernel Parameters (passing board info data):

2
arch/microblaze/lib/bootm.c
View File

@ -59,7 +59,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
if (ret)
return 1;
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
if (!of_flat_tree && argc > 3)
of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);

2
arch/mips/lib/bootm.c
View File

@ -56,7 +56,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
/* find kernel entry point */
theKernel = (void (*)(int, char **, char **, int *))images->ep;
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
#ifdef DEBUG
printf ("## Transferring control to Linux (at address %08lx) ...\n",

2
arch/mips/lib/bootm_qemu_mips.c
View File

@ -39,7 +39,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
/* find kernel entry point */
theKernel = (void (*)(int, char **, char **, int *))images->ep;
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
debug ("## Transferring control to Linux (at address %08lx) ...\n",
(ulong) theKernel);

2
arch/nds32/lib/bootm.c
View File

@ -69,7 +69,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
printf("Using machid 0x%x from environment\n", machid);
}
show_boot_progress(15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
debug("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)theKernel);

2
arch/powerpc/lib/bootm.c
View File

@ -69,7 +69,7 @@ static void boot_jump_linux(bootm_headers_t *images)
debug ("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);
show_boot_progress (15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && !defined(CONFIG_E500)
unlock_ram_in_cache();

2
board/Seagate/dockstar/dockstar.c
View File

@ -169,7 +169,7 @@ static void set_leds(u32 leds, u32 blinking)
void show_boot_progress(int val)
{
switch (val) {
case 15: /* booting Linux */
case BOOTSTAGE_ID_RUN_OS: /* booting Linux */
set_leds(BOTH_LEDS, NEITHER_LED);
break;
case 64: /* Ethernet initialization */

2
board/a4m072/a4m072.c
View File

@ -484,7 +484,7 @@ void show_boot_progress(int status)
display_out_pos = 0; /* reset output position */
/* we want to flush status 15 now */
if (status == 15)
if (status == BOOTSTAGE_ID_RUN_OS)
display_flush();
}
#endif

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

@ -117,7 +117,7 @@ void show_boot_progress(int status)
case 12:
case 13:
case 14:
case 15:
case BOOTSTAGE_ID_RUN_OS:
stamp_led_set(STATUS_LED_OFF, STATUS_LED_OFF, STATUS_LED_OFF);
break;
default:

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

@ -250,7 +250,7 @@ void show_boot_progress(int val)
case 12:
setbits_be32(&gpio->simple_dvo, LED_Y);
break;
case 15:
case BOOTSTAGE_ID_RUN_OS:
setbits_be32(&gpio->simple_dvo, LED_R);
break;
default:

3
board/pcs440ep/pcs440ep.c
View File

@ -110,8 +110,7 @@ void show_boot_progress (int val)
status_led_set (1, STATUS_LED_ON);
status_led_set (2, STATUS_LED_ON);
break;
case 15:
/* booting */
case BOOTSTAGE_ID_RUN_OS:
status_led_set (0, STATUS_LED_ON);
status_led_set (1, STATUS_LED_ON);
status_led_set (2, STATUS_LED_ON);

2
board/sixnet/sixnet.c
View File

@ -46,7 +46,7 @@ void show_boot_progress (int status)
{
#if defined(CONFIG_STATUS_LED)
# if defined(STATUS_LED_BOOT)
if (status == 15) {
if (status == BOOTSTAGE_ID_RUN_OS) {
/* ready to transfer to kernel, make sure LED is proper state */
status_led_set(STATUS_LED_BOOT, CONFIG_BOOT_LED_STATE);
}

2
board/ti/beagle/beagle.c
View File

@ -485,7 +485,7 @@ int board_mmc_init(bd_t *bis)
/* Call usb_stop() before starting the kernel */
void show_boot_progress(int val)
{
if(val == 15)
if (val == BOOTSTAGE_ID_RUN_OS)
usb_stop();
}

8
common/cmd_bootm.c
View File

@ -1334,7 +1334,7 @@ static int do_bootm_netbsd(int flag, int argc, char * const argv[],
"(at address %08lx) ...\n",
(ulong)loader);
show_boot_progress(15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
/*
* NetBSD Stage-2 Loader Parameters:
@ -1392,7 +1392,7 @@ static int do_bootm_rtems(int flag, int argc, char * const argv[],
printf("## Transferring control to RTEMS (at address %08lx) ...\n",
(ulong)entry_point);
show_boot_progress(15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
/*
* RTEMS Parameters:
@ -1425,7 +1425,7 @@ static int do_bootm_ose(int flag, int argc, char * const argv[],
printf("## Transferring control to OSE (at address %08lx) ...\n",
(ulong)entry_point);
show_boot_progress(15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
/*
* OSE Parameters:
@ -1506,7 +1506,7 @@ static int do_bootm_integrity(int flag, int argc, char * const argv[],
printf("## Transferring control to INTEGRITY (at address %08lx) ...\n",
(ulong)entry_point);
show_boot_progress(15);
show_boot_progress(BOOTSTAGE_ID_RUN_OS);
/*
* INTEGRITY Parameters: