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/canyonlands_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/canyonlands_defconfig')
| -rw-r--r-- | configs/canyonlands_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index e936d7b130..12d335233d 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -3,6 +3,7 @@ CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_CANYONLANDS=y CONFIG_DEFAULT_DEVICE_TREE="canyonlands" +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y -CONFIG_REGEX=y |
