Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 6a98536f2083d2eecf8da75287497e1e701f4430..142753f9e7aa5a2725c6025ab91d4e22b7f9bb3d 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -26,8 +26,9 @@ config SPL_FRAMEWORK
          and the Linux Kernel.  If unsure, say Y.
 
 config SPL_SIZE_LIMIT
-       hex "Maximum size of SPL image"
+       int "Maximum size of SPL image"
        depends on SPL
+       default 69632 if ARCH_MX6
        default 0
        help
          Specifies the maximum length of the U-Boot SPL image.
@@ -61,6 +62,26 @@ config SPL_SIZE_LIMIT_PROVIDE_STACK
          of SRAM available for SPL when the stack required before reolcation
          uses this SRAM, too.
 
+menu "PowerPC SPL Boot options"
+       depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK)
+
+config SPL_NAND_BOOT
+       bool "Load SPL from NAND flash"
+
+config SPL_MMC_BOOT
+       bool "Load SPL from SD Card / eMMC"
+
+config SPL_SPI_BOOT
+       bool "Load SPL from SPI flash"
+
+config SPL_FSL_PBL
+       bool "Create SPL in Freescale PBI format"
+       help
+         Create boot binary having SPL binary in PBI format concatenated with
+         u-boot binary.
+
+endmenu
+
 config HANDOFF
        bool "Pass hand-off information from SPL to U-Boot proper"
        depends on BLOBLIST
@@ -1187,5 +1208,17 @@ config TPL_YMODEM_SUPPORT
 
 endif # TPL
 
+config SPL_AT91_MCK_BYPASS
+       bool "Use external clock signal as a source of main clock for AT91 platforms"
+       depends on ARCH_AT91
+       default n
+       help
+         Use external 8 to 24 Mhz clock signal as source of main clock instead
+         of an external crystal oscillator.
+         This option disables the internal driving on the XOUT pin.
+         The external source has to provide a stable clock on the XIN pin.
+         If this option is disabled, the SoC expects a crystal oscillator
+         that needs driving on both XIN and XOUT lines.
+
 endif # SPL
 endmenu