Merge tag 'xilinx-for-v2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / common / spl / Kconfig

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 59a7b20..92de9cd 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -26,9 +26,10 @@ 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
+       default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB
+       default 200704 if ARCH_MX6 && MX6_OCRAM_256KB
        default 0
        help
          Specifies the maximum length of the U-Boot SPL image.
@@ -115,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
@@ -608,6 +609,15 @@ config SPL_MMC_SUPPORT
          this option to build the drivers in drivers/mmc as part of an SPL
          build.
 
+config SPL_FORCE_MMC_BOOT
+       bool "Force SPL booting from MMC"
+       depends on SPL_MMC_SUPPORT
+       default n
+       help
+         Force SPL to use MMC device for Linux kernel booting even when the
+         SoC ROM recognized boot medium is not eMMC/SD. This is crucial for
+         factory or 'falcon mode' booting.
+
 config SPL_MMC_TINY
        bool "Tiny MMC framework in SPL"
        depends on SPL_MMC_SUPPORT
@@ -964,7 +974,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"
@@ -1186,7 +1196,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