Merge tag 'v2021.10-rc4' into next

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

diff --git a/common/Kconfig.boot b/common/Kconfig.boot
index 902a5b8..f23b998 100644 (file)
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -80,7 +80,6 @@ config FIT_SIGNATURE_MAX_SIZE
 config FIT_RSASSA_PSS
        bool "Support rsassa-pss signature scheme of FIT image contents"
        depends on FIT_SIGNATURE
-       default n
        help
          Enable this to support the pss padding algorithm as described
          in the rfc8017 (https://tools.ietf.org/html/rfc8017).
@@ -373,6 +372,26 @@ config CHROMEOS_VBOOT
          distinguishing between booting Chrome OS in a basic way (developer
          mode) and a full boot.
 
+config RAMBOOT_PBL
+       bool "Freescale PBL(pre-boot loader) image format support"
+       help
+         Some SoCs use PBL to load RCW and/or pre-initialization instructions.
+         For more details refer to doc/README.pblimage
+
+config SYS_FSL_PBL_PBI
+       string "PBI(pre-boot instructions) commands for the PBL image"
+       depends on RAMBOOT_PBL
+       help
+         PBI commands can be used to configure SoC before it starts the execution.
+         Please refer doc/README.pblimage for more details.
+
+config SYS_FSL_PBL_RCW
+       string "Aadditional RCW (Power on reset configuration) for the PBL image"
+       depends on RAMBOOT_PBL
+       help
+         Enables addition of RCW (Power on reset configuration) in built image.
+         Please refer doc/README.pblimage for more details.
+
 endmenu                # Boot images
 
 menu "Boot timing"
@@ -682,7 +701,6 @@ config NOR_BOOT
 
 config NAND_BOOT
        bool "Support for booting from NAND flash"
-       default n
        imply MTD_RAW_NAND
        help
          Enabling this will make a U-Boot binary that is capable of being
@@ -691,7 +709,6 @@ config NAND_BOOT
 
 config ONENAND_BOOT
        bool "Support for booting from ONENAND"
-       default n
        imply MTD_RAW_NAND
        help
          Enabling this will make a U-Boot binary that is capable of being
@@ -700,7 +717,6 @@ config ONENAND_BOOT
 
 config QSPI_BOOT
        bool "Support for booting from QSPI flash"
-       default n
        help
          Enabling this will make a U-Boot binary that is capable of being
          booted via QSPI flash. This is not a must, some SoCs need this,
@@ -708,7 +724,6 @@ config QSPI_BOOT
 
 config SATA_BOOT
        bool "Support for booting from SATA"
-       default n
        help
          Enabling this will make a U-Boot binary that is capable of being
          booted via SATA. This is not a must, some SoCs need this,
@@ -716,7 +731,6 @@ config SATA_BOOT
 
 config SD_BOOT
        bool "Support for booting from SD/EMMC"
-       default n
        help
          Enabling this will make a U-Boot binary that is capable of being
          booted via SD/EMMC. This is not a must, some SoCs need this,
@@ -724,7 +738,6 @@ config SD_BOOT
 
 config SPI_BOOT
        bool "Support for booting from SPI flash"
-       default n
        help
          Enabling this will make a U-Boot binary that is capable of being
          booted via SPI flash. This is not a must, some SoCs need this,
@@ -758,7 +771,6 @@ config BOOTDELAY
 
 config AUTOBOOT_KEYED
        bool "Stop autobooting via specific input key / string"
-       default n
        help
          This option enables stopping (aborting) of the automatic
          boot feature only by issuing a specific input key or
@@ -845,7 +857,6 @@ config AUTOBOOT_STOP_STR
 config AUTOBOOT_KEYED_CTRLC
        bool "Enable Ctrl-C autoboot interruption"
        depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
-       default n
        help
          This option allows for the boot sequence to be interrupted
          by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".