summaryrefslogtreecommitdiffstats
path: root/board
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 /board
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 'board')
-rw-r--r--board/sunxi/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 8e273968dd..e744d4af4e 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -569,9 +569,6 @@ config GMAC_TX_DELAY
config SYS_MALLOC_CLEAR_ON_INIT
default n
-config NET
- default y
-
config NETDEVICES
default y
OpenPOWER on IntegriCloud