MIPS: fix syntax for fdt_chosen/initrd.

[u-boot] / common / Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 6b5d166429accfabab724338f3c7a9de57ee0402..88dc0160796e745a8ec7f683591e75f45fa0c758 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
        help
          Backward compatibility.
 
+config SYS_PROMPT
+       string "Shell prompt"
+       default "=> "
+       help
+         This string is displayed in the command line to the left of the
+         cursor.
+
 menu "Autoboot options"
 
 config AUTOBOOT_KEYED
@@ -45,9 +52,14 @@ config AUTOBOOT_PROMPT
          the responsibility of the user to select only such arguments
          that are valid in the given context.
 
+config AUTOBOOT_ENCRYPTION
+       bool "Enable encryption in autoboot stopping"
+       depends on AUTOBOOT_KEYED
+       default n
+
 config AUTOBOOT_DELAY_STR
        string "Delay autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED
+       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
        help
          This option delays the automatic boot feature by issuing
          a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR
@@ -59,7 +71,7 @@ config AUTOBOOT_DELAY_STR
 
 config AUTOBOOT_STOP_STR
        string "Stop autobooting via specific input key / string"
-       depends on AUTOBOOT_KEYED
+       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
        help
          This option enables stopping (aborting) of the automatic
          boot feature only by issuing a specific input key or
@@ -71,7 +83,7 @@ config AUTOBOOT_STOP_STR
 
 config AUTOBOOT_KEYED_CTRLC
        bool "Enable Ctrl-C autoboot interruption"
-       depends on AUTOBOOT_KEYED
+       depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
        default n
        help
          This option allows for the boot sequence to be interrupted
@@ -79,6 +91,15 @@ config AUTOBOOT_KEYED_CTRLC
          Setting this variable provides an escape sequence from the
          limited "password" strings.
 
+config AUTOBOOT_STOP_STR_SHA256
+       string "Stop autobooting via SHA256 encrypted password"
+       depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
+       help
+         This option adds the feature to only stop the autobooting,
+         and therefore boot into the U-Boot prompt, when the input
+         string / password matches a values that is encypted via
+         a SHA256 hash and saved in the environment.
+
 endmenu
 
 comment "Commands"
@@ -87,11 +108,13 @@ menu "Info commands"
 
 config CMD_BDI
        bool "bdinfo"
+       default y
        help
          Print board info
 
 config CMD_CONSOLE
        bool "coninfo"
+       default y
        help
          Print console devices and information.
 
@@ -114,6 +137,7 @@ menu "Boot commands"
 
 config CMD_BOOTD
        bool "bootd"
+       default y
        help
          Run the command stored in the environment "bootcmd", i.e.
          "bootd" does the same thing as "run bootcmd".
@@ -132,21 +156,25 @@ config CMD_GO
 
 config CMD_RUN
        bool "run"
+       default y
        help
          Run the command in the given environment variable.
 
 config CMD_IMI
        bool "iminfo"
+       default y
        help
          Print header information for application image.
 
 config CMD_IMLS
        bool "imls"
+       default y
        help
          List all images found in flash
 
 config CMD_XIMG
        bool "imxtract"
+       default y
        help
          Extract a part of a multi-image.
 
@@ -168,13 +196,23 @@ config CMD_IMPORTENV
 
 config CMD_EDITENV
        bool "editenv"
+       default y
        help
          Edit environment variable.
 
 config CMD_SAVEENV
        bool "saveenv"
+       default y
        help
-         Run the command in the given environment variable.
+         Save all environment variables into the compiled-in persistent
+         storage.
+
+config CMD_ENV_EXISTS
+       bool "env exists"
+       default y
+       help
+         Check if a variable is defined in the environment for use in
+         shell scripting.
 
 endmenu
 
@@ -182,6 +220,7 @@ menu "Memory commands"
 
 config CMD_MEMORY
        bool "md, mm, nm, mw, cp, cmp, base, loop"
+       default y
        help
          Memeory commands.
            md - memory display
@@ -249,16 +288,19 @@ config CMD_DEMO
 
 config CMD_LOADB
        bool "loadb"
+       default y
        help
          Load a binary file over serial line.
 
 config CMD_LOADS
        bool "loads"
+       default y
        help
          Load an S-Record file over serial line
 
 config CMD_FLASH
        bool "flinfo, erase, protect"
+       default y
        help
          NOR flash support.
            flinfo - print FLASH memory information
@@ -276,6 +318,11 @@ config CMD_NAND
        help
          NAND support.
 
+config CMD_SF
+       bool "sf"
+       help
+         SPI Flash support
+
 config CMD_SPI
        bool "sspi"
        help
@@ -293,6 +340,7 @@ config CMD_USB
 
 config CMD_FPGA
        bool "fpga"
+       default y
        help
          FPGA support.
 
@@ -303,21 +351,25 @@ menu "Shell scripting commands"
 
 config CMD_ECHO
        bool "echo"
+       default y
        help
          Echo args to console
 
 config CMD_ITEST
        bool "itest"
+       default y
        help
          Return true/false on integer compare.
 
 config CMD_SOURCE
        bool "source"
+       default y
        help
          Run script from memory
 
 config CMD_SETEXPR
        bool "setexpr"
+       default y
        help
          Evaluate boolean and math expressions and store the result in an env
            variable.
@@ -331,6 +383,7 @@ menu "Network commands"
 config CMD_NET
        bool "bootp, tftpboot"
         select NET
+       default y
        help
          Network commands.
          bootp - boot image via network using BOOTP/TFTP protocol
@@ -358,6 +411,7 @@ config CMD_DHCP
 
 config CMD_NFS
        bool "nfs"
+       default y
        help
          Boot image via network using NFS protocol.
 
@@ -398,6 +452,7 @@ config CMD_TIME
 # TODO: rename to CMD_SLEEP
 config CMD_MISC
        bool "sleep"
+       default y
        help
          Delay execution for some time
 
@@ -409,6 +464,7 @@ config CMD_TIMER
 config CMD_SETGETDCR
        bool "getdcr, setdcr, getidcr, setidcr"
        depends on 4xx
+       default y
        help
          getdcr - Get an AMCC PPC 4xx DCR's value
          setdcr - Set an AMCC PPC 4xx DCR's value