summaryrefslogtreecommitdiff
path: root/include/configs/omap3_logic.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-01 20:47:23 (GMT)
committerTom Rini <trini@konsulko.com>2015-06-02 12:53:41 (GMT)
commit563e53efaadd76def21612bcf9f0236d870b6e68 (patch)
tree0d66d466f2c9a4cd1f6356fe889a60429745ec13 /include/configs/omap3_logic.h
parent656ae05273419c344c11466de72476455793d6b6 (diff)
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff)
downloadu-boot-563e53efaadd76def21612bcf9f0236d870b6e68.tar.xz
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/omap3_logic.h')
-rw-r--r--include/configs/omap3_logic.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 13cd35b..6783f68 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -106,10 +106,8 @@
#define CONFIG_CMD_MMC /* MMC support */
#define CONFIG_CMD_NAND /* NAND support */
#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
-#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETEXPR /* Evaluate expressions */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
#undef CONFIG_CMD_FPGA /* FPGA configuration Support */