Merge branch 'master' of git://git.denx.de/u-boot-i2c

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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index ef43ed8..ea1a325 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -254,6 +254,14 @@ config CMD_BOOTMENU
        help
          Add an ANSI terminal boot menu command.
 
        help
          Add an ANSI terminal boot menu command.
 

+config CMD_DTIMG
+       bool "dtimg"
+       help
+         Android DTB/DTBO image manipulation commands. Read dtb/dtbo files from
+         image into RAM, dump image structure information, etc. Those dtb/dtbo
+         files should be merged in one dtb further, which needs to be passed to
+         the kernel, as part of a boot process.
+

 config CMD_ELF
        bool "bootelf, bootvx"
        default y
 config CMD_ELF
        bool "bootelf, bootvx"
        default y


@@ -296,11 +304,6 @@ config CMD_XIMG
        help
          Extract a part of a multi-image.
 
        help
          Extract a part of a multi-image.
 

-config CMD_POWEROFF
-       bool "poweroff"
-       help
-         Poweroff/Shutdown the system
-

 config CMD_SPL
        bool "spl export - Export boot information for Falcon boot"
        depends on SPL
 config CMD_SPL
        bool "spl export - Export boot information for Falcon boot"
        depends on SPL


@@ -442,6 +445,7 @@ config CRC32_VERIFY
 
 config CMD_EEPROM
        bool "eeprom - EEPROM subsystem"
 
 config CMD_EEPROM
        bool "eeprom - EEPROM subsystem"

+       depends on !DM_I2C || DM_I2C_COMPAT

        help
          (deprecated, needs conversion to driver model)
          Provides commands to read and write EEPROM (Electrically Erasable
        help
          (deprecated, needs conversion to driver model)
          Provides commands to read and write EEPROM (Electrically Erasable


@@ -607,6 +611,15 @@ config CMD_ADC
          Shows ADC device info and permit printing one-shot analog converted
          data from a named Analog to Digital Converter.
 
          Shows ADC device info and permit printing one-shot analog converted
          data from a named Analog to Digital Converter.
 

+config CMD_BIND
+       bool "bind/unbind - Bind or unbind a device to/from a driver"
+       depends on DM
+       help
+         Bind or unbind a device to/from a driver from the command line.
+         This is useful in situations where a device may be handled by several
+         drivers. For example, this can be used to bind a UDC to the usb ether
+         gadget driver from the command line.
+

 config CMD_CLK
        bool "clk - Show clock frequencies"
        help
 config CMD_CLK
        bool "clk - Show clock frequencies"
        help


@@ -815,6 +828,13 @@ config CMD_I2C
        help
          I2C support.
 
        help
          I2C support.
 

+config CMD_W1
+       depends on W1
+       default y if W1
+       bool "w1 - Support for Dallas 1-Wire protocol"
+       help
+         Dallas 1-wire protocol support
+

 config CMD_LOADB
        bool "loadb"
        default y
 config CMD_LOADB
        bool "loadb"
        default y


@@ -847,6 +867,12 @@ config CMD_MMC_SWRITE
          Enable support for the "mmc swrite" command to write Android sparse
          images to eMMC.
 
          Enable support for the "mmc swrite" command to write Android sparse
          images to eMMC.
 

+config CMD_MTD
+       bool "mtd"
+       select MTD_PARTITIONS
+       help
+         MTD commands support.
+

 config CMD_NAND
        bool "nand"
        default y if NAND_SUNXI
 config CMD_NAND
        bool "nand"
        default y if NAND_SUNXI


@@ -896,6 +922,14 @@ config CMD_ONENAND
          and erasing blocks. It allso provides a way to show and change
          bad blocks, and test the device.
 
          and erasing blocks. It allso provides a way to show and change
          bad blocks, and test the device.
 

+config CMD_OSD
+       bool "osd"
+       help
+         Enable the 'osd' command which allows to query information from and
+         write text data to a on-screen display (OSD) device; a virtual device
+         associated with a display capable of displaying a text overlay on the
+         display it's associated with..
+

 config CMD_PART
        bool "part"
        select HAVE_BLOCK_DEVICE
 config CMD_PART
        bool "part"
        select HAVE_BLOCK_DEVICE


@@ -920,6 +954,19 @@ config CMD_PCMCIA
          about 1990. These devices are typically removable memory or network
          cards using a standard 68-pin connector.
 
          about 1990. These devices are typically removable memory or network
          cards using a standard 68-pin connector.
 

+config CMD_PINMUX
+       bool "pinmux - show pins muxing"
+       default y if PINCTRL
+       help
+         Parse all available pin-controllers and show pins muxing. This
+         is useful for debug purpoer to check the pin muxing and to know if
+         a pin is configured as a GPIO or as an alternate function.
+
+config CMD_POWEROFF
+       bool "poweroff"
+       help
+         Poweroff/Shutdown the system
+

 config CMD_READ
        bool "read - Read binary data from a partition"
        help
 config CMD_READ
        bool "read - Read binary data from a partition"
        help


@@ -1027,6 +1074,21 @@ config CMD_USB_MASS_STORAGE
        help
          USB mass storage support
 
        help
          USB mass storage support
 

+config CMD_VIRTIO
+       bool "virtio"
+       depends on VIRTIO
+       default y if VIRTIO
+       help
+         VirtIO block device support
+
+config CMD_AXI
+       bool "axi"
+       depends on AXI
+       help
+         Enable the command "axi" for accessing AXI (Advanced eXtensible
+         Interface) busses, a on-chip interconnect specification for managing
+         functional blocks in SoC designs, which is also often used in designs
+         involving FPGAs (e.g.  communication with IP cores in Xilinx FPGAs).

 endmenu
 
 
 endmenu
 
 


@@ -1066,6 +1128,7 @@ if NET
 menuconfig CMD_NET
        bool "Network commands"
        default y
 menuconfig CMD_NET
        bool "Network commands"
        default y

+       imply NETDEVICES

 
 if CMD_NET
 
 
 if CMD_NET
 


@@ -1312,6 +1375,20 @@ config CMD_CACHE
        help
          Enable the "icache" and "dcache" commands
 
        help
          Enable the "icache" and "dcache" commands
 

+config CMD_CONITRACE
+       bool "conitrace - trace console input codes"
+       help
+         Enable the 'conitrace' command which displays the codes received
+         from the console input as hexadecimal numbers.
+
+config CMD_CLS
+       bool "Enable clear screen command 'cls'"
+       depends on CFB_CONSOLE || DM_VIDEO || LCD || VIDEO
+       default y if LCD
+       help
+         Enable the 'cls' command which clears the screen contents
+         on video frame buffer.
+

 config CMD_DISPLAY
        bool "Enable the 'display' command, for character displays"
        help
 config CMD_DISPLAY
        bool "Enable the 'display' command, for character displays"
        help


@@ -1667,18 +1744,22 @@ config CMD_MTDPARTS
        bool "MTD partition support"
        select MTD_DEVICE if (CMD_NAND || NAND)
        help
        bool "MTD partition support"
        select MTD_DEVICE if (CMD_NAND || NAND)
        help

-         MTD partition support
+         MTD partitioning tool support.
+         It is strongly encouraged to avoid using this command
+         anymore along with 'sf', 'nand', 'onenand'. One can still
+         declare the partitions in the mtdparts environment variable
+         but better use the MTD stack and the 'mtd' command instead.

 
 config MTDIDS_DEFAULT
        string "Default MTD IDs"
 
 config MTDIDS_DEFAULT
        string "Default MTD IDs"

-       depends on CMD_MTDPARTS || CMD_NAND || CMD_FLASH
+       depends on MTD_PARTITIONS || CMD_MTDPARTS || CMD_NAND || CMD_FLASH

        help
          Defines a default MTD IDs list for use with MTD partitions in the
          Linux MTD command line partitions format.
 
 config MTDPARTS_DEFAULT
        string "Default MTD partition scheme"
        help
          Defines a default MTD IDs list for use with MTD partitions in the
          Linux MTD command line partitions format.
 
 config MTDPARTS_DEFAULT
        string "Default MTD partition scheme"

-       depends on CMD_MTDPARTS || CMD_NAND || CMD_FLASH
+       depends on MTD_PARTITIONS || CMD_MTDPARTS || CMD_NAND || CMD_FLASH

        help
          Defines a default MTD partitioning scheme in the Linux MTD command
          line partitions format
        help
          Defines a default MTD partitioning scheme in the Linux MTD command
          line partitions format


@@ -1754,6 +1835,7 @@ config CMD_IRQ
 
 config CMD_KGDB
        bool "kgdb - Allow debugging of U-Boot with gdb"
 
 config CMD_KGDB
        bool "kgdb - Allow debugging of U-Boot with gdb"

+       depends on PPC

        help
          This enables a 'kgdb' command which allows gdb to connect to U-Boot
          over a serial link for debugging purposes. This allows
        help
          This enables a 'kgdb' command which allows gdb to connect to U-Boot
          over a serial link for debugging purposes. This allows


@@ -1798,8 +1880,6 @@ endmenu
 
 config CMD_UBI
        tristate "Enable UBI - Unsorted block images commands"
 
 config CMD_UBI
        tristate "Enable UBI - Unsorted block images commands"

-       default y if NAND_SUNXI
-       select CMD_MTDPARTS

        select CRC32
        select MTD_UBI
        help
        select CRC32
        select MTD_UBI
        help


@@ -1809,6 +1889,8 @@ config CMD_UBI
          capabilities. Please, consult the MTD web site for more details
          (www.linux-mtd.infradead.org). Activate this option if you want
          to use U-Boot UBI commands.
          capabilities. Please, consult the MTD web site for more details
          (www.linux-mtd.infradead.org). Activate this option if you want
          to use U-Boot UBI commands.

+         It is also strongly encouraged to also enable CONFIG_MTD to get full
+         partition support.

 
 config CMD_UBIFS
        tristate "Enable UBIFS - Unsorted block images filesystem commands"
 
 config CMD_UBIFS
        tristate "Enable UBIFS - Unsorted block images filesystem commands"