[U-Boot] [RFC PATCH v2 15/15] bootstage: arm: Add bootstage calls in board and bootm

Simon Glass
2011-12-10T21:08:07Z

Add calls to bootstage before and after relocation, and just
before jumping to the OS.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Unify show_boot_progress() into this series

arch/arm/lib/board.c | 3 +++
arch/arm/lib/bootm.c | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 3d78274..e4b243b 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -266,6 +266,8 @@ void board_init_f(ulong bootflag)
ulong reg;
#endif

+ bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r");
+
/* Pointer is writable since we allocated a register for it */
gd = (gd_t *) ((CONFIG_SYS_INIT_SP_ADDR) & ~0x07);
/* compiler optimization barrier needed for GCC >= 3.4 */
@@ -455,6 +457,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
gd = id;

gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
+ bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_F, "board_init_f");

monitor_flash_len = _end_ofs;

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index c400a50..4cd37e9 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -83,6 +83,10 @@ void arch_lmb_reserve(struct lmb *lmb)
static void announce_and_cleanup(void)
{
printf("\nStarting kernel ...\n\n");
+ bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
+#ifdef CONFIG_BOOTSTAGE_REPORT
+ bootstage_report();
+#endif

#ifdef CONFIG_USB_DEVICE
{
--
1.7.3.1