Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 0a445313f62cee1c2c96eb4aa505cd15a2b6aa7d..c1451bceda1bdd2f8e76c190a2c9c6fa84026c43 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -95,6 +95,16 @@ config SYS_MALLOC_F_LEN
          particular needs this to operate, so that it can allocate the
          initial serial device and any others that are needed.
 
+config SPL_SYS_MALLOC_F_LEN
+        hex "Size of malloc() pool in spl before relocation"
+        depends on SYS_MALLOC_F
+        default SYS_MALLOC_F_LEN
+        help
+          Before relocation, memory is very limited on many platforms. Still,
+          we can provide a small malloc() pool if needed. Driver model in
+          particular needs this to operate, so that it can allocate the
+          initial serial device and any others that are needed.
+
 menuconfig EXPERT
        bool "Configure standard U-Boot features (expert users)"
        default y
@@ -145,6 +155,7 @@ menu "Boot images"
 config FIT
        bool "Support Flattened Image Tree"
        select MD5
+       select SHA1
        help
          This option allows you to boot the new uImage structure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
@@ -159,6 +170,7 @@ if FIT
 
 config FIT_ENABLE_SHA256_SUPPORT
        bool "Support SHA256 checksum of FIT image contents"
+       select SHA256
        default y
        help
          Enable this to support SHA256 checksum of FIT image contents. A
@@ -218,18 +230,22 @@ config FIT_IMAGE_POST_PROCESS
          injected into the FIT creation (i.e. the blobs would have been pre-
          processed before being added to the FIT image).
 
+if SPL
+
 config SPL_FIT
        bool "Support Flattened Image Tree within SPL"
        depends on SPL
+       select SPL_OF_LIBFDT
 
 config SPL_FIT_SIGNATURE
        bool "Enable signature verification of FIT firmware within SPL"
-       depends on SPL_FIT
        depends on SPL_DM
+       select SPL_FIT
        select SPL_RSA
 
 config SPL_LOAD_FIT
        bool "Enable SPL loading U-Boot as a FIT"
+       select SPL_FIT
        help
          Normally with the SPL framework a legacy image is generated as part
          of the build. This contains U-Boot along with information as to
@@ -252,6 +268,26 @@ config SPL_FIT_IMAGE_POST_PROCESS
          injected into the FIT creation (i.e. the blobs would have been pre-
          processed before being added to the FIT image).
 
+config SPL_FIT_SOURCE
+       string ".its source file for U-Boot FIT image"
+       depends on SPL_FIT
+       help
+         Specifies a (platform specific) FIT source file to generate the
+         U-Boot FIT image. This could specify further image to load and/or
+         execute.
+
+config SPL_FIT_GENERATOR
+       string ".its file generator script for U-Boot FIT image"
+       depends on SPL_FIT
+       default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI
+       help
+         Specifies a (platform specific) script file to generate the FIT
+         source file used to build the U-Boot FIT image file. This gets
+         passed a list of supported device tree file stub names to
+         include in the generated image.
+
+endif # SPL
+
 endif # FIT
 
 config OF_BOARD_SETUP