Merge https://gitlab.denx.de/u-boot/custodians/u-boot-samsung

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

diff --git a/common/Kconfig b/common/Kconfig
index 318d372..2bb3798 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -17,6 +17,14 @@ config CONSOLE_RECORD
          To enable console recording, call console_record_reset_enable()
          from your code.
 
+config CONSOLE_RECORD_INIT_F
+       bool "Enable console recording during pre-relocation init"
+       depends on CONSOLE_RECORD && SYS_MALLOC_F
+       default y
+       help
+         This option enables console recording during pre-relocation init.
+         CONFIG_SYS_MALLOC_F must be enabled to use this feature.
+
 config CONSOLE_RECORD_OUT_SIZE
        hex "Output buffer size"
        depends on CONSOLE_RECORD
@@ -553,6 +561,7 @@ config HASH
 config AVB_VERIFY
        bool "Build Android Verified Boot operations"
        depends on LIBAVB
+       depends on MMC
        depends on PARTITION_UUIDS
        help
          This option enables compilation of bootloader-dependent operations,
@@ -599,9 +608,15 @@ endmenu
 
 menu "Update support"
 
+config UPDATE_COMMON
+       bool
+       default n
+       select DFU_WRITE_ALT
+
 config UPDATE_TFTP
        bool "Auto-update using fitImage via TFTP"
        depends on FIT
+       select UPDATE_COMMON
        help
          This option allows performing update of NOR with data in fitImage
          sent via TFTP boot.
@@ -616,6 +631,15 @@ config UPDATE_TFTP_MSEC_MAX
        default 100
        depends on UPDATE_TFTP
 
+config UPDATE_FIT
+       bool "Firmware update using fitImage"
+       depends on FIT
+       depends on DFU
+       select UPDATE_COMMON
+       help
+         This option allows performing update of DFU-capable storage with
+         data in fitImage.
+
 config ANDROID_AB
        bool "Android A/B updates"
        default n
@@ -674,6 +698,16 @@ config BLOBLIST_ADDR
          Sets the address of the bloblist, set up by the first part of U-Boot
          which runs. Subsequent U-Boot stages typically use the same address.
 
+config BLOBLIST_SIZE_RELOC
+       hex "Size of bloblist after relocation"
+       depends on BLOBLIST
+       default BLOBLIST_SIZE
+       help
+         Sets the size of the bloblist in bytes after relocation. Since U-Boot
+         has a lot more memory available then, it is possible to use a larger
+         size than the one set up by SPL. This bloblist is set up during the
+         relocation process.
+
 endmenu
 
 source "common/spl/Kconfig"