image-fit: switch ENOLINK to ENOENT

[karo-tx-uboot.git] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 4d17b101a1a5840c58a02faa0c31ce51f0cfe72b..449411274429bc2d22cc89b76e1d2c13dcb550a9 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -9,13 +9,13 @@ config BOOTSTAGE
          give the entry a name with bootstage_mark_name(). You can also
          record elapsed time in a particular stage using bootstage_start()
          before starting and bootstage_accum() when finished. Bootstage will
-         add up all the accumated time and report it.
+         add up all the accumulated time and report it.
 
          Normally, IDs are defined in bootstage.h but a small number of
-         additional 'user' IDs can be used but passing BOOTSTAGE_ID_ALLOC
+         additional 'user' IDs can be used by passing BOOTSTAGE_ID_ALLOC
          as the ID.
 
-         Calls to show_boot_progress() wil also result in log entries but
+         Calls to show_boot_progress() will also result in log entries but
          these will not have names.
 
 config BOOTSTAGE_REPORT
@@ -53,7 +53,7 @@ config BOOTSTAGE_FDT
          Stash the bootstage information in the FDT. A root 'bootstage'
          node is created with each bootstage id as a child. Each child
          has a 'name' property and either 'mark' containing the
-         mark time in microsecond, or 'accum' containing the
+         mark time in microseconds, or 'accum' containing the
          accumulated time for that bootstage id in microseconds.
          For example:
 
@@ -97,20 +97,84 @@ config BOOTSTAGE_STASH_SIZE
 
 endmenu
 
+menu "Boot media"
+
+config NOR_BOOT
+       bool "Support for booting from NOR flash"
+       depends on NOR
+       help
+         Enabling this will make a U-Boot binary that is capable of being
+         booted via NOR.  In this case we will enable certain pinmux early
+         as the ROM only partially sets up pinmux.  We also default to using
+         NOR for environment.
+
+config NAND_BOOT
+       bool "Support for booting from NAND flash"
+       default n
+       help
+         Enabling this will make a U-Boot binary that is capable of being
+         booted via NAND flash. This is not a must, some SoCs need this,
+         some not.
+
+config ONENAND_BOOT
+       bool "Support for booting from ONENAND"
+       default n
+       help
+         Enabling this will make a U-Boot binary that is capable of being
+         booted via ONENAND. This is not a must, some SoCs need this,
+         some not.
+
+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,
+         some not.
+
+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,
+         some not.
+
+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,
+         some not.
+
+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,
+         some not.
+
+endmenu
+
 config BOOTDELAY
        int "delay in seconds before automatically booting"
-       default 0
+       default 2
+       depends on AUTOBOOT
        help
          Delay before automatically running bootcmd;
+         set to 0 to autoboot with no delay, but you can stop it by key input.
          set to -1 to disable autoboot.
          set to -2 to autoboot with no delay and not check for abort
-         (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).
+
+         See doc/README.autoboot for details.
 
 config CONSOLE_RECORD
        bool "Console recording"
        help
          This provides a way to record console output (and provide console
-         input) through cirular buffers. This is mostly useful for testing.
+         input) through circular buffers. This is mostly useful for testing.
          Console output is recorded even when the console is silent.
          To enable console recording, call console_record_reset_enable()
          from your code.
@@ -133,3 +197,9 @@ config CONSOLE_RECORD_IN_SIZE
          tstc() and getc() will use this in preference to real device input.
          The buffer is allocated immediately after the malloc() region is
          ready.
+
+config SYS_NO_FLASH
+       bool "Disable support for parallel NOR flash"
+       default n
+       help
+         This option is used to disable support for parallel NOR flash.