diff options
author | Tom Rini <trini@konsulko.com> | 2015-06-01 16:47:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-06-02 08:53:41 -0400 |
commit | 563e53efaadd76def21612bcf9f0236d870b6e68 (patch) | |
tree | 0d66d466f2c9a4cd1f6356fe889a60429745ec13 /configs/colibri_vf_defconfig | |
parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
download | talos-obmc-uboot-563e53efaadd76def21612bcf9f0236d870b6e68.tar.gz talos-obmc-uboot-563e53efaadd76def21612bcf9f0236d870b6e68.zip |
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/colibri_vf_defconfig')
-rw-r--r-- | configs/colibri_vf_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 3b1f66aa76..b2d1ed803f 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_COLIBRI_VF=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND" +CONFIG_CMD_NET=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y |