kconfig: remove unneeded dependency on !SPL_BUILD

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

diff --git a/common/Kconfig b/common/Kconfig
index 83cceaaef7efe42b8330c74e434aae1242674240..13cedbe9ad475bd1d4cd703a81978c8475aff661 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,5 +1,4 @@
 menu "Command line interface"
 menu "Command line interface"

-       depends on !SPL_BUILD

 
 config HUSH_PARSER
        bool "Use hush shell"
 
 config HUSH_PARSER
        bool "Use hush shell"


@@ -24,11 +23,13 @@ menu "Info commands"
 
 config CMD_BDI
        bool "bdinfo"
 
 config CMD_BDI
        bool "bdinfo"

+       default y

        help
          Print board info
 
 config CMD_CONSOLE
        bool "coninfo"
        help
          Print board info
 
 config CMD_CONSOLE
        bool "coninfo"

+       default y

        help
          Print console devices and information.
 
        help
          Print console devices and information.
 


@@ -43,6 +44,7 @@ menu "Boot commands"
 
 config CMD_BOOTD
        bool "bootd"
 
 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".
        help
          Run the command stored in the environment "bootcmd", i.e.
          "bootd" does the same thing as "run bootcmd".


@@ -72,21 +74,25 @@ config CMD_GO
 
 config CMD_RUN
        bool "run"
 
 config CMD_RUN
        bool "run"

+       default y

        help
          Run the command in the given environment variable.
 
 config CMD_IMI
        bool "iminfo"
        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"
        help
          Print header information for application image.
 
 config CMD_IMLS
        bool "imls"

+       default !SYS_NO_FLASH

        help
          List all images found in flash
 
 config CMD_XIMG
        bool "imxtract"
        help
          List all images found in flash
 
 config CMD_XIMG
        bool "imxtract"

+       default y

        help
          Extract a part of a multi-image.
 
        help
          Extract a part of a multi-image.
 


@@ -119,11 +125,13 @@ config CMD_IMPORTENV
 
 config CMD_EDITENV
        bool "editenv"
 
 config CMD_EDITENV
        bool "editenv"

+       default y

        help
          Edit environment variable.
 
 config CMD_SAVEENV
        bool "saveenv"
        help
          Edit environment variable.
 
 config CMD_SAVEENV
        bool "saveenv"

+       default y

        help
          Run the command in the given environment variable.
 
        help
          Run the command in the given environment variable.
 


@@ -133,6 +141,7 @@ menu "Memory commands"
 
 config CMD_MEMORY
        bool "md, mm, nm, mw, cp, cmp, base, loop"
 
 config CMD_MEMORY
        bool "md, mm, nm, mw, cp, cmp, base, loop"

+       default y

        help
          Memeory commands.
            md - memory display
        help
          Memeory commands.
            md - memory display


@@ -175,18 +184,44 @@ endmenu
 
 menu "Device access commands"
 
 
 menu "Device access commands"
 

+config CMD_DM
+       bool "dm - Access to driver model information"
+       depends on DM
+       default y
+       help
+         Provides access to driver model data structures and information,
+         such as a list of devices, list of uclasses and the state of each
+         device (e.g. activated). This is not required for operation, but
+         can be useful to see the state of driver model for debugging or
+         interest.
+
+config CMD_DEMO
+       bool "demo - Demonstration commands for driver model"
+       depends on DM
+       help
+         Provides a 'demo' command which can be used to play around with
+         driver model. To use this properly you will need to enable one or
+         both of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE).
+         Otherwise you will always get an empty list of devices. The demo
+         devices are defined in the sandbox device tree, so the easiest
+         option is to use sandbox and pass the -d point to sandbox's
+         u-boot.dtb file.
+

 config CMD_LOADB
        bool "loadb"
 config CMD_LOADB
        bool "loadb"

+       default y

        help
          Load a binary file over serial line.
 
 config CMD_LOADS
        bool "loads"
        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"
        help
          Load an S-Record file over serial line
 
 config CMD_FLASH
        bool "flinfo, erase, protect"

+       default y if !SYS_NO_FLASH

        help
          NOR flash support.
            flinfo - print FLASH memory information
        help
          NOR flash support.
            flinfo - print FLASH memory information


@@ -214,6 +249,10 @@ config CMD_NAND_TRIMFFS
          for using NAND flash filesystems on NAND controllers with
          a non-0xff ECC code for all 0xff data.
 
          for using NAND flash filesystems on NAND controllers with
          a non-0xff ECC code for all 0xff data.
 

+config CMD_ROMUPDATE
+       bool
+       depends on NAND
+

 config CMD_MMC
        bool "mmc/sd"
        select PARTITIONS
 config CMD_MMC
        bool "mmc/sd"
        select PARTITIONS


@@ -237,6 +276,7 @@ config CMD_USB
 
 config CMD_FPGA
        bool "fpga"
 
 config CMD_FPGA
        bool "fpga"

+       default y

        help
          FPGA support.
 
        help
          FPGA support.
 


@@ -247,16 +287,19 @@ menu "Shell scripting commands"
 
 config CMD_ECHO
        bool "echo"
 
 config CMD_ECHO
        bool "echo"

+       default y

        help
          Echo args to console
 
 config CMD_ITEST
        bool "itest"
        help
          Echo args to console
 
 config CMD_ITEST
        bool "itest"

+       default y

        help
          Return true/false on integer compare.
 
 config CMD_SOURCE
        bool "source"
        help
          Return true/false on integer compare.
 
 config CMD_SOURCE
        bool "source"

+       default y

        help
          Run script from memory
 
        help
          Run script from memory
 


@@ -266,6 +309,7 @@ menu "Network commands"
 
 config CMD_NET
        bool "bootp, tftpboot"
 
 config CMD_NET
        bool "bootp, tftpboot"

+       default y

        help
          Network commands.
          bootp - boot image via network using BOOTP/TFTP protocol
        help
          Network commands.
          bootp - boot image via network using BOOTP/TFTP protocol


@@ -291,8 +335,86 @@ config CMD_DHCP
        help
          Boot image via network using DHCP/TFTP protocol
 
        help
          Boot image via network using DHCP/TFTP protocol
 

+if CMD_DHCP
+
+menu "DHCP options"
+
+config BOOTP_BOOTFILESIZE
+       bool "obtain bootfile size from DHCP"
+
+config BOOTP_BOOTPATH
+       bool "obtain bootfile path from DHCP"
+
+config BOOTP_DNS
+       bool "obtain DNS server IP address from DHCP"
+
+config BOOTP_DNS2
+       bool "store secondary DNS IP address in dnsip2"
+
+config BOOTP_GATEWAY
+       bool "obtain gateway IP address from DHCP"
+
+config BOOTP_ID_CACHE_SIZE
+       int "DHCP transaction ID cache size"
+       default 4
+       help
+         BOOTP packets are uniquely identified using a 32-bit ID. The
+         server will copy the ID from client requests to responses and
+         U-Boot will use this to determine if it is the destination of
+         an incoming response. Some servers will check that addresses
+         aren't in use before handing them out (usually using an ARP
+         ping) and therefore take up to a few hundred milliseconds to
+         respond. Network congestion may also influence the time it
+         takes for a response to make it back to the client. If that
+         time is too long, U-Boot will retransmit requests. In order
+         to allow earlier responses to still be accepted after these
+         retransmissions, U-Boot's BOOTP client keeps a small cache of
+         IDs. The CONFIG_BOOTP_ID_CACHE_SIZE controls the size of this
+         cache. The default is to keep IDs for up to four outstanding
+         requests. Increasing this will allow U-Boot to accept offers
+         from a BOOTP client in networks with unusually high latency.
+
+config BOOTP_MAY_FAIL
+       bool "Do not start over, if DHCP server is not available"
+       help
+         If the DHCP server is not found after the configured retry
+         count, the call will fail instead of starting over.  This
+         can be used to fail over to Link-local IP address
+         configuration if the DHCP server is not available.
+
+config BOOTP_NISDOMAIN
+       bool "obtain NIS domain from DHCP"
+
+config BOOTP_NTPSERVER
+       bool "obtain NTP server IP address from DHCP"
+
+config BOOTP_RANDOM_DELAY
+       bool "Use a (pseudo) random delay between DHCP retries"
+       select LIB_RAND
+
+config BOOTP_RANDOM_ID
+       bool "Generate a (pseudo) random transaction ID"
+       select LIB_RAND
+
+config BOOTP_SEND_HOSTNAME
+       bool "send hostname in DHCP request"
+
+config BOOTP_SUBNETMASK
+       bool "obtain subnet mask from DHCP"
+
+config BOOTP_TIMEOFFSET
+       bool "obtain  from DHCP"
+
+config BOOTP_VENDOREX
+       bool "obtain  from DHCP"
+
+endmenu
+
+endif
+

 config CMD_NFS
        bool "nfs"
 config CMD_NFS
        bool "nfs"

+       default y

        help
          Boot image via network using NFS protocol.
 
        help
          Boot image via network using NFS protocol.
 


@@ -321,6 +443,11 @@ config CMD_LINK_LOCAL
        help
          Acquire a network IP address using the link-local protocol
 
        help
          Acquire a network IP address using the link-local protocol
 

+config CMD_MII
+       bool "MII register access"
+       help
+         Support reading/writing ETH PHY registers via MII bus
+

 endmenu
 
 menu "Misc commands"
 endmenu
 
 menu "Misc commands"


@@ -335,9 +462,15 @@ config CMD_TIME
        help
          Run commands and summarize execution time.
 
        help
          Run commands and summarize execution time.
 

+config CMD_FUSE
+       bool "fuse read/write"
+       help
+         eFuse reading and programming support
+

 # TODO: rename to CMD_SLEEP
 config CMD_MISC
        bool "sleep"
 # TODO: rename to CMD_SLEEP
 config CMD_MISC
        bool "sleep"

+       default y

        help
          Delay execution for some time
 
        help
          Delay execution for some time
 


@@ -349,6 +482,7 @@ config CMD_TIMER
 config CMD_SETGETDCR
        bool "getdcr, setdcr, getidcr, setidcr"
        depends on 4xx
 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
        help
          getdcr - Get an AMCC PPC 4xx DCR's value
          setdcr - Set an AMCC PPC 4xx DCR's value


@@ -381,3 +515,13 @@ config ENV_IS_IN_SPI_FLASH
 endchoice
 
 endmenu
 endchoice
 
 endmenu

+
+menu "Display configuration"
+
+config LCD
+       bool "LCD support"
+
+config DISPLAY_BOARDINFO
+       bool "Display board info"
+
+endmenu