bootstage: Fix dependency for BOOTSTAGE_RECORD_COUNT

At present these three Kconfigs exist even when bootstage is not enabled.
This is not necessary since bootstage.c is only built if BOOTSTAGE is
enabled.

Make them conditional. Also fix up the overflow message to mention TPL.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig.boot b/common/Kconfig.boot
index 70c02b9e30a6a00ee17bf29461a82168293d7189..e650c605d1d216cbf8d93292782c82bdd65a5382 100644 (file)
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -449,6 +449,7 @@ config BOOTSTAGE_REPORT
 
 config BOOTSTAGE_RECORD_COUNT
        int "Number of boot stage records to store"
+       depends on BOOTSTAGE
        default 30
        help
          This is the size of the bootstage record list and is the maximum
@@ -456,6 +457,7 @@ config BOOTSTAGE_RECORD_COUNT
 
 config SPL_BOOTSTAGE_RECORD_COUNT
        int "Number of boot stage records to store for SPL"
+       depends on SPL_BOOTSTAGE
        default 5
        help
          This is the size of the bootstage record list and is the maximum
@@ -463,6 +465,7 @@ config SPL_BOOTSTAGE_RECORD_COUNT
 
 config TPL_BOOTSTAGE_RECORD_COUNT
        int "Number of boot stage records to store for TPL"
+       depends on TPL_BOOTSTAGE
        default 5
        help
          This is the size of the bootstage record list and is the maximum

diff --git a/common/bootstage.c b/common/bootstage.c
index d5b78b9f48726bd02923462b7226fbb27db15d75..2c0110c26307ee442767e4b69c51320ff33796dd 100644 (file)
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -349,7 +349,7 @@ void bootstage_report(void)
        }
        if (data->rec_count > RECORD_COUNT)
                printf("Overflowed internal boot id table by %d entries\n"
-                      "Please increase CONFIG_(SPL_)BOOTSTAGE_RECORD_COUNT\n",
+                      "Please increase CONFIG_(SPL_TPL_)BOOTSTAGE_RECORD_COUNT\n",
                       data->rec_count - RECORD_COUNT);
 
        puts("\nAccumulated time:\n");