[U-Boot] [PATCH 2/2] bootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress()
Simon Glass
sjg at chromium.org
Sun Oct 16 20:40:46 CEST 2011
This changes the number 15 as used in boot_stage_progress() to use the
new name provided for it,
Signed-off-by: Simon Glass <sjg at chromium.org>
---
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/powerpc/lib/bootm.c | 2 +-
board/csb226/csb226.c | 12 +++++++++---
board/innokom/innokom.c | 8 +++++---
board/pcs440ep/pcs440ep.c | 3 +--
board/sixnet/sixnet.c | 2 +-
common/cmd_bootm.c | 8 ++++----
12 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 802e833..2751f44 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 c9a55ff..f180737 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 1229ac7..233782b 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 9f6d6d6..24b9e09 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 40a5647..5b7e74f 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 f1906c6..47f5310 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/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 8233f1f..e448f6c 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/csb226/csb226.c b/board/csb226/csb226.c
index dd29e62..72cfc82 100644
--- a/board/csb226/csb226.c
+++ b/board/csb226/csb226.c
@@ -146,9 +146,15 @@ void csb226_set_led(int led, int state)
void show_boot_progress (int status)
{
switch(status) {
- case 1: csb226_set_led(0,1); break;
- case 5: csb226_set_led(1,1); break;
- case 15: csb226_set_led(2,1); break;
+ case 1:
+ csb226_set_led(0, 1);
+ break;
+ case 5:
+ csb226_set_led(1, 1);
+ break;
+ case BOOTSTAGE_ID_RUN_OS:
+ csb226_set_led(2, 1);
+ break;
}
return;
diff --git a/board/innokom/innokom.c b/board/innokom/innokom.c
index 22de7e3..0409c78 100644
--- a/board/innokom/innokom.c
+++ b/board/innokom/innokom.c
@@ -169,9 +169,11 @@ void show_boot_progress (int status)
{
switch(status) {
/*
- case 1: csb226_set_led(0,1); break;
- case 5: csb226_set_led(1,1); break;
- case 15: csb226_set_led(2,1); break;
+ case 1: csb226_set_led(0,1); break;
+ case 5: csb226_set_led(1,1); break;
+ case BOOTSTAGE_ID_RUN_OS:
+ csb226_set_led(2,1);
+ break;
*/
}
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index 5a3ec58..36994b5 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 edb5d13..a13c72d 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/common/cmd_bootm.c b/common/cmd_bootm.c
index c2e8038..1ba6c44 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -1310,7 +1310,7 @@ static int do_bootm_netbsd (int flag, int argc, char * const argv[],
printf ("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n",
(ulong)loader);
- show_boot_progress (15);
+ show_boot_progress(BOOTSTAGE_ID_RUN_OS);
/*
* NetBSD Stage-2 Loader Parameters:
@@ -1368,7 +1368,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:
@@ -1401,7 +1401,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:
@@ -1482,7 +1482,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:
--
1.7.3.1
More information about the U-Boot
mailing list