X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fbootstage.h;h=685939ccffc0f85aaa2638e19e28cb1a052b5b81;hb=a29491ade0adf3dbb9dc51be8b45530edde1f1df;hp=d105ae0181395da05bfe2d0f85bb8958a428f981;hpb=bafed105426ddb6003157bad9c522e6fcca60033;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/bootstage.h b/include/bootstage.h index d105ae0..685939c 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -11,6 +11,8 @@ #ifndef _BOOTSTAGE_H #define _BOOTSTAGE_H +#include + /* Flags for each bootstage record */ enum bootstage_flags { BOOTSTAGEF_ERROR = 1 << 0, /* Error record */ @@ -164,6 +166,8 @@ enum bootstage_id { BOOTSTAGE_ID_NAND_FIT_READ_OK, BOOTSTAGE_ID_FIT_LOADABLE_START = 160, /* for Loadable Images */ + + BOOTSTAGE_ID_FIT_SPL_START = 170, /* for SPL Images */ /* * These boot stages are new, higher level, and not directly related * to the old boot progress numbers. They are useful for recording @@ -174,6 +178,8 @@ enum bootstage_id { BOOTSTAGE_ID_END_TPL, BOOTSTAGE_ID_START_SPL, BOOTSTAGE_ID_END_SPL, + BOOTSTAGE_ID_START_VPL, + BOOTSTAGE_ID_END_VPL, BOOTSTAGE_ID_START_UBOOT_F, BOOTSTAGE_ID_START_UBOOT_R, BOOTSTAGE_ID_USB_START, @@ -199,9 +205,12 @@ enum bootstage_id { BOOTSTAGE_ID_ACCUM_DECOMP, BOOTSTAGE_ID_ACCUM_OF_LIVE, BOOTSTAGE_ID_FPGA_INIT, - BOOTSTATE_ID_ACCUM_DM_SPL, - BOOTSTATE_ID_ACCUM_DM_F, - BOOTSTATE_ID_ACCUM_DM_R, + BOOTSTAGE_ID_ACCUM_DM_SPL, + BOOTSTAGE_ID_ACCUM_DM_F, + BOOTSTAGE_ID_ACCUM_DM_R, + BOOTSTAGE_ID_ACCUM_FSP_M, + BOOTSTAGE_ID_ACCUM_FSP_S, + BOOTSTAGE_ID_ACCUM_MMAP_SPI, /* a few spare for the user, from here */ BOOTSTAGE_ID_USER, @@ -215,7 +224,7 @@ enum bootstage_id { */ ulong timer_get_boot_us(void); -#if defined(USE_HOSTCC) +#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) #define show_boot_progress(val) do {} while (0) #else /** @@ -243,7 +252,7 @@ void show_boot_progress(int val); * Call this after relocation has happened and after malloc has been initted. * We need to copy any pointers in bootstage records that were added pre- * relocation, since memory can be overwritten later. - * @return Always returns 0, to indicate success + * Return: Always returns 0, to indicate success */ int bootstage_relocate(void); @@ -261,13 +270,28 @@ ulong bootstage_add_record(enum bootstage_id id, const char *name, /** * Mark a time stamp for the current boot stage. */ -ulong bootstage_mark(enum bootstage_id id); - -ulong bootstage_error(enum bootstage_id id); +#define bootstage_mark(id) bootstage_mark_name(id, __func__) +#define bootstage_error(id) bootstage_error_name(id, __func__) +/** + * bootstage_mark_name - record bootstage with passing id and name + * @id: Bootstage id to record this timestamp against + * @name: Textual name to display for this id in the report + * + * Return: recorded time stamp + */ ulong bootstage_mark_name(enum bootstage_id id, const char *name); /** + * bootstage_error_name - record bootstage error with passing id and name + * @id: Bootstage id to record this timestamp against + * @name: Textual name to display for this id in the report + * + * Return: recorded time stamp + */ +ulong bootstage_error_name(enum bootstage_id id, const char *name); + +/** * Mark a time stamp in the given function and line number * * See BOOTSTAGE_MARKER() for a convenient macro. @@ -275,7 +299,7 @@ ulong bootstage_mark_name(enum bootstage_id id, const char *name); * @param file Filename to record (NULL if none) * @param func Function name to record * @param linenum Line number to record - * @return recorded time stamp + * Return: recorded time stamp */ ulong bootstage_mark_code(const char *file, const char *func, int linenum); @@ -289,7 +313,7 @@ ulong bootstage_mark_code(const char *file, const char *func, * * @param id Bootstage id to record this timestamp against * @param name Textual name to display for this id in the report (maybe NULL) - * @return start timestamp in microseconds + * Return: start timestamp in microseconds */ uint32_t bootstage_start(enum bootstage_id id, const char *name); @@ -301,7 +325,7 @@ uint32_t bootstage_start(enum bootstage_id id, const char *name); * as many times as you like. * * @param id Bootstage id to record this timestamp against - * @return time spent in this iteration of the activity (i.e. the time now + * Return: time spent in this iteration of the activity (i.e. the time now * less the start time recorded in the last bootstage_start() call * with this id. */ @@ -313,7 +337,7 @@ void bootstage_report(void); /** * Add bootstage information to the device tree * - * @return 0 if ok, -ve on error + * Return: 0 if ok, -ve on error */ int bootstage_fdt_add_report(void); @@ -322,7 +346,7 @@ int bootstage_fdt_add_report(void); * * @param base Base address of memory buffer * @param size Size of memory buffer - * @return 0 if stashed ok, -1 if out of space + * Return: 0 if stashed ok, -1 if out of space */ int bootstage_stash(void *base, int size); @@ -334,8 +358,8 @@ int bootstage_stash(void *base, int size); * * @param base Base address of memory buffer * @param size Size of memory buffer (-1 if unknown) - * @return 0 if unstashed ok, -ENOENT if bootstage info not found, -ENOSPC if - * there is not space for read the stacked data, or other error if + * Return: 0 if unstashed ok, -ENOENT if bootstage info not found, -ENOSPC if + * there is not space for read the stashed data, or other error if * something else went wrong */ int bootstage_unstash(const void *base, int size); @@ -343,7 +367,7 @@ int bootstage_unstash(const void *base, int size); /** * bootstage_get_size() - Get the size of the bootstage data * - * @return size of boostage data in bytes + * Return: size of boostage data in bytes */ int bootstage_get_size(void);