bootstage: Drop unused options

[people/ms/u-boot.git] / include / bootstage.h

diff --git a/include/bootstage.h b/include/bootstage.h
index 8607e887d8b1e0ebcf858625668b89b53f5752fb..7a524782bae45d4c07db7f8031be2a1b8ebe61ac 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -12,11 +12,6 @@
 #ifndef _BOOTSTAGE_H
 #define _BOOTSTAGE_H
 
-/* Define this for host tools */
-#ifndef CONFIG_BOOTSTAGE_USER_COUNT
-#define CONFIG_BOOTSTAGE_USER_COUNT    20
-#endif
-
 /* Flags for each bootstage record */
 enum bootstage_flags {
        BOOTSTAGEF_ERROR        = 1 << 0,       /* Error record */
@@ -177,6 +172,7 @@ enum bootstage_id {
         */
        BOOTSTAGE_ID_AWAKE,
        BOOTSTAGE_ID_START_SPL,
+       BOOTSTAGE_ID_END_SPL,
        BOOTSTAGE_ID_START_UBOOT_F,
        BOOTSTAGE_ID_START_UBOOT_R,
        BOOTSTAGE_ID_USB_START,
@@ -199,11 +195,14 @@ enum bootstage_id {
        BOOTSTAGE_ID_ACCUM_SCSI,
        BOOTSTAGE_ID_ACCUM_SPI,
        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,
 
        /* a few spare for the user, from here */
        BOOTSTAGE_ID_USER,
-       BOOTSTAGE_ID_COUNT = BOOTSTAGE_ID_USER + CONFIG_BOOTSTAGE_USER_COUNT,
        BOOTSTAGE_ID_ALLOC,
 };
 
@@ -226,8 +225,14 @@ ulong timer_get_boot_us(void);
 void show_boot_progress(int val);
 #endif
 
-#if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD) && \
-       !defined(USE_HOSTCC)
+#if !defined(USE_HOSTCC)
+#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#define ENABLE_BOOTSTAGE
+#endif
+#endif
+
+#ifdef ENABLE_BOOTSTAGE
+
 /* This is the full bootstage implementation */
 
 /**
@@ -327,9 +332,11 @@ 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, -1 if bootstage info not found, or out of space
+ * @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
+ *     something else went wrong
  */
-int bootstage_unstash(void *base, int size);
+int bootstage_unstash(const void *base, int size);
 
 /**
  * bootstage_get_size() - Get the size of the bootstage data
@@ -402,7 +409,7 @@ static inline int bootstage_stash(void *base, int size)
        return 0;       /* Pretend to succeed */
 }
 
-static inline int bootstage_unstash(void *base, int size)
+static inline int bootstage_unstash(const void *base, int size)
 {
        return 0;       /* Pretend to succeed */
 }
@@ -416,7 +423,8 @@ static inline int bootstage_init(bool first)
 {
        return 0;
 }
-#endif /* CONFIG_BOOTSTAGE */
+
+#endif /* ENABLE_BOOTSTAGE */
 
 /* Helper macro for adding a bootstage to a line of code */
 #define BOOTSTAGE_MARKER()     \