diff options
author | Tom Rini <trini@konsulko.com> | 2015-06-01 20:47:23 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-06-02 12:53:41 (GMT) |
commit | 563e53efaadd76def21612bcf9f0236d870b6e68 (patch) | |
tree | 0d66d466f2c9a4cd1f6356fe889a60429745ec13 /configs/m53evk_defconfig | |
parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
download | u-boot-563e53efaadd76def21612bcf9f0236d870b6e68.tar.xz |
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 'configs/m53evk_defconfig')
-rw-r--r-- | configs/m53evk_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index c918532..0a40f18 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_M53EVK=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg" -CONFIG_REGEX=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y |