From 578ac1e9ba4c79175e69becb28e7157a84eff241 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 10 Dec 2011 11:07:54 +0000 Subject: [PATCH] bootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress() 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 Acked-by: Mike Frysinger --- arch/arm/lib/bootm.c | 2 +- arch/avr32/lib/bootm.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 2 +- arch/mips/lib/bootm.c | 2 +- arch/mips/lib/bootm_qemu_mips.c | 2 +- arch/nds32/lib/bootm.c | 2 +- arch/powerpc/lib/bootm.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/a4m072/a4m072.c | 2 +- board/bf533-stamp/bf533-stamp.c | 2 +- board/matrix_vision/mvbc_p/mvbc_p.c | 2 +- board/pcs440ep/pcs440ep.c | 3 +-- board/sixnet/sixnet.c | 2 +- board/ti/beagle/beagle.c | 2 +- common/cmd_bootm.c | 8 ++++---- 16 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index afa0093df7..249ac1b312 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -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) diff --git a/arch/avr32/lib/bootm.c b/arch/avr32/lib/bootm.c index c9a55ffb2c..f18073796c 100644 --- a/arch/avr32/lib/bootm.c +++ b/arch/avr32/lib/bootm.c @@ -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); diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index 1229ac7f25..233782b8e6 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -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): diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 9f6d6d660f..24b9e09ac4 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -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); diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 40a564718f..5b7e74ff19 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -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", diff --git a/arch/mips/lib/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c index f1906c6775..47f5310d41 100644 --- a/arch/mips/lib/bootm_qemu_mips.c +++ b/arch/mips/lib/bootm_qemu_mips.c @@ -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); diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c index b0a5a0dff8..5ae90fb719 100644 --- a/arch/nds32/lib/bootm.c +++ b/arch/nds32/lib/bootm.c @@ -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); diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index efcfe84ad9..37f162a11e 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -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(); diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index a1de0dc4df..8cbfb02b15 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -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 */ diff --git a/board/a4m072/a4m072.c b/board/a4m072/a4m072.c index 09a5a5183b..9485cfb0f7 100644 --- a/board/a4m072/a4m072.c +++ b/board/a4m072/a4m072.c @@ -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 diff --git a/board/bf533-stamp/bf533-stamp.c b/board/bf533-stamp/bf533-stamp.c index 935aad240b..b1134e937d 100644 --- a/board/bf533-stamp/bf533-stamp.c +++ b/board/bf533-stamp/bf533-stamp.c @@ -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: diff --git a/board/matrix_vision/mvbc_p/mvbc_p.c b/board/matrix_vision/mvbc_p/mvbc_p.c index 439217653e..9dffedc9bd 100644 --- a/board/matrix_vision/mvbc_p/mvbc_p.c +++ b/board/matrix_vision/mvbc_p/mvbc_p.c @@ -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: diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 5a3ec58445..36994b531c 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -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); diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index edb5d133b7..a13c72dcd7 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -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); } diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index c09c833980..114ab7e450 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -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(); } diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 93045841f9..c787288587 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -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: -- 2.39.5