Merge tag 'u-boot-imx-20191009' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / common / spl / Kconfig

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index f59b6f5b51f41b80073ab72ac5ebf847983651f3..57d06ccece5952126b5ffea348a3cc23f373a3c2 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -26,7 +26,7 @@ config SPL_FRAMEWORK
          and the Linux Kernel.  If unsure, say Y.
 
 config SPL_SIZE_LIMIT
-       int "Maximum size of SPL image"
+       hex "Maximum size of SPL image"
        depends on SPL
        default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB
        default 200704 if ARCH_MX6 && MX6_OCRAM_256KB
@@ -116,7 +116,7 @@ if SPL
 
 config SPL_HANDOFF
        bool "Pass hand-off information from SPL to U-Boot proper"
-       depends on HANDOFF
+       depends on HANDOFF && SPL_BLOBLIST
        default y
        help
          This option enables SPL to write handoff information. This can be
@@ -973,7 +973,7 @@ config SPL_SERIAL_SUPPORT
          for displaying messages while SPL is running. It also brings in
          printf() and panic() functions. This should normally be enabled
          unless there are space reasons not to. Even then, consider
-         enabling USE_TINY_PRINTF which is a small printf() version.
+         enabling SPL_USE_TINY_PRINTF which is a small printf() version.
 
 config SPL_SPI_FLASH_SUPPORT
        bool "Support SPI flash drivers"
@@ -1195,7 +1195,7 @@ if TPL
 
 config TPL_HANDOFF
        bool "Pass hand-off information from TPL to SPL and U-Boot proper"
-       depends on HANDOFF
+       depends on HANDOFF && TPL_BLOBLIST
        default y
        help
          This option enables TPL to write handoff information. This can be