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 048b85b..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.
@@ -138,6 +139,7 @@ config SPL_TEXT_BASE
        default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I
        default 0x20060 if MACH_SUN50I_H6
        default 0x00060 if ARCH_SUNXI
+       default 0xfffc0000 if ARCH_ZYNQMP
        default 0x0
        help
          The address in memory that SPL will be running from.
@@ -607,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