spl: Make SPL_DISABLE_BANNER_PRINT a positive option

Rather than having a negative option, make this a positive option and
enable it by default. This makes it easier to understand.

Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 365e692d8b54e713f2372a83189548c8c761f21e..32fa5758bf610c80091af9b1116a8a06a6618a56 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -135,12 +135,21 @@ config SPL_SEPARATE_BSS
          location is used. Normally we put the device tree at the end of BSS
          but with this option enabled, it goes at _image_binary_end.
 
-config SPL_DISABLE_BANNER_PRINT
-       bool "Disable output of the SPL banner 'U-Boot SPL ...'"
+config SPL_BANNER_PRINT
+       bool "Enable output of the SPL banner 'U-Boot SPL ...'"
+       default y
+       help
+         If this option is enabled, SPL will print the banner with version
+         info. Disabling this option could be useful to reduce TPL boot time
+         (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
+
+config TPL_BANNER_PRINT
+       bool "Enable output of the TPL banner 'U-Boot TPL ...'"
+       default y
        help
          If this option is enabled, SPL will not print the banner with version
-         info. Selecting this option could be useful to reduce SPL boot time
-         (e.g. approx. 6 ms slower, when output on i.MX6 with 115200 baud).
+         info. Disabling this option could be useful to reduce SPL boot time
+         (e.g. approx. 6 ms faster, when output on i.MX6 with 115200 baud).
 
 config SPL_DISPLAY_PRINT
        bool "Display a board-specific message in SPL"

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 23be33c5c109358607fe33f4792a7dfde14c9aed..5a026b844e916cadb2a0cb8f9232525324b0be88 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -607,7 +607,7 @@ void preloader_console_init(void)
 
        gd->have_console = 1;
 
-#ifndef CONFIG_SPL_DISABLE_BANNER_PRINT
+#if CONFIG_IS_ENABLED(BANNER_PRINT)
        puts("\nU-Boot " SPL_TPL_NAME " " PLAIN_VERSION " (" U_BOOT_DATE " - "
             U_BOOT_TIME " " U_BOOT_TZ ")\n");
 #endif