diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
commit | 856f60dbd157126241cf9033514137849bb5ca22 (patch) | |
tree | fca1784ef63b89a78127a0f4d1340f90eedd6848 /commands/Kconfig | |
parent | ec78bea331e195fff267ae949cee4777ef1add56 (diff) | |
parent | f4ca20c4d27751ee749f382cfd4949d825534fce (diff) | |
download | barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.gz barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.xz |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/Kconfig')
-rw-r--r-- | commands/Kconfig | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 1336097671..5e4db90c21 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -57,10 +57,6 @@ config CMD_READLINE tristate prompt "readline" -config CMD_LN - tristate - prompt "ln" - config CMD_TRUE tristate default y @@ -216,6 +212,10 @@ config CMD_DIRNAME Strip last component of file name and store the result in a environment variable +config CMD_LN + tristate + prompt "ln" + config CMD_READLINK tristate prompt "readlink" @@ -630,6 +630,17 @@ config CMD_USB help The usb command allows to rescan for USB devices. +config CMD_MIITOOL + tristate + depends on PHYLIB + prompt "miitool" + help + The miitool command allows to view media-independent interface status. + The default short output reports the negotiated link speed and + link status for selected MII. The '-v' option displays more + detailed MII status information, such as MII capabilities, + current advertising mode, and link partner capabilities. + config CMD_CLK tristate depends on COMMON_CLK |