summaryrefslogtreecommitdiff
path: root/include/configs/titanium.h
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 /include/configs/titanium.h
parent656ae05273419c344c11466de72476455793d6b6 (diff)
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff)
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 'include/configs/titanium.h')
-rw-r--r--include/configs/titanium.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 7490fa8bed..49aa3c7de3 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -43,7 +43,6 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
#define CONFIG_FEC_MXC
#define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR