Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / bootstage.h

diff --git a/include/bootstage.h b/include/bootstage.h
index d105ae0..99a334a 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -11,6 +11,8 @@
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 
+#include <linux/kconfig.h>
+
 /* Flags for each bootstage record */
 enum bootstage_flags {
        BOOTSTAGEF_ERROR        = 1 << 0,       /* Error record */
@@ -199,9 +201,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 +220,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 +248,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);
 
@@ -275,7 +280,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 +294,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 +306,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 +318,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 +327,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 +339,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 +348,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);