diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-01 20:47:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-02 12:53:41 (GMT) |
| commit | 563e53efaadd76def21612bcf9f0236d870b6e68 (patch) | |
| tree | 0d66d466f2c9a4cd1f6356fe889a60429745ec13 /include/configs/p1_p2_rdb_pc.h | |
| parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
| parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
| download | u-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/p1_p2_rdb_pc.h')
| -rw-r--r-- | include/configs/p1_p2_rdb_pc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a5f9717..b51379e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -775,7 +775,6 @@ #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_E1000 /* Defind e1000 pci Ethernet card*/ #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_DOS_PARTITION @@ -906,7 +905,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO /* |