summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-01 16:47:23 -0400
committerTom Rini <trini@konsulko.com>2015-06-02 08:53:41 -0400
commit563e53efaadd76def21612bcf9f0236d870b6e68 (patch)
tree0d66d466f2c9a4cd1f6356fe889a60429745ec13 /common
parent656ae05273419c344c11466de72476455793d6b6 (diff)
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff)
downloadu-boot-imx-563e53efaadd76def21612bcf9f0236d870b6e68.zip
u-boot-imx-563e53efaadd76def21612bcf9f0236d870b6e68.tar.gz
u-boot-imx-563e53efaadd76def21612bcf9f0236d870b6e68.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-net
Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 5b8b0c3..a2167f0 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -252,12 +252,21 @@ config CMD_SOURCE
help
Run script from memory
+config CMD_SETEXPR
+ bool "setexpr"
+ help
+ Evaluate boolean and math expressions and store the result in an env
+ variable.
+ Also supports loading the value at a memory location into a variable.
+ If CONFIG_REGEX is enabled, setexpr also supports a gsub function.
+
endmenu
menu "Network commands"
config CMD_NET
bool "bootp, tftpboot"
+ select NET
help
Network commands.
bootp - boot image via network using BOOTP/TFTP protocol