summaryrefslogtreecommitdiffstats
path: root/configs/integratorap_cm946es_defconfig
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 /configs/integratorap_cm946es_defconfig
parent656ae05273419c344c11466de72476455793d6b6 (diff)
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff)
downloadtalos-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/integratorap_cm946es_defconfig')
-rw-r--r--configs/integratorap_cm946es_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index 1e8c15796d..dc933c5101 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM946ES=y
+CONFIG_CMD_NET=y
OpenPOWER on IntegriCloud