summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-12-10 11:08:06 +0000
committerWolfgang Denk <wd@denx.de>2012-03-18 21:42:56 +0100
commit573f14fe4ed5b803207824be9e3147e894b68f8b (patch)
treebc6f50c9210dc98f8eceb90ced6b518864a6317b /common
parent3a608ca01d76e8cb90dcc8dc1a22cde98cdca3ab (diff)
downloadu-boot-imx-573f14fe4ed5b803207824be9e3147e894b68f8b.zip
u-boot-imx-573f14fe4ed5b803207824be9e3147e894b68f8b.tar.gz
u-boot-imx-573f14fe4ed5b803207824be9e3147e894b68f8b.tar.bz2
bootstage: Plumb in bootstage calls for basic operations
This inserts bootstage calls into tftp, usb start and bootm. We could go further, but this is a reasonable start to illustrate the concept. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c2
-rw-r--r--common/cmd_net.c7
-rw-r--r--common/cmd_usb.c1
3 files changed, 9 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index fd9f3e9..d88f6c0 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -199,6 +199,8 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
bootm_start_lmb();
+ bootstage_mark_name(BOOTSTAGE_ID_BOOTM_START, "bootm_start");
+
/* get kernel image header, start address and length */
os_hdr = boot_get_kernel(cmdtp, flag, argc, argv,
&images, &images.os.image_start, &images.os.image_len);
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 6139188..65f32bc 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -43,7 +43,12 @@ U_BOOT_CMD(
int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- return netboot_common(TFTPGET, cmdtp, argc, argv);
+ int ret;
+
+ bootstage_mark_name(BOOTSTAGE_KERNELREAD_START, "tftp_start");
+ ret = netboot_common(TFTPGET, cmdtp, argc, argv);
+ bootstage_mark_name(BOOTSTAGE_KERNELREAD_STOP, "tftp_done");
+ return ret;
}
U_BOOT_CMD(
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 4a86590..9eba271 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -513,6 +513,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if ((strncmp(argv[1], "reset", 5) == 0) ||
(strncmp(argv[1], "start", 5) == 0)) {
+ bootstage_mark_name(BOOTSTAGE_ID_USB_START, "usb_start");
usb_stop();
printf("(Re)start USB...\n");
i = usb_init();