diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-01 16:47:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-02 08:53:41 -0400 |
| commit | 563e53efaadd76def21612bcf9f0236d870b6e68 (patch) | |
| tree | 0d66d466f2c9a4cd1f6356fe889a60429745ec13 /include/configs/P1022DS.h | |
| parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
| parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
| download | u-boot-imx-563e53efaadd76def21612bcf9f0236d870b6e68.zip u-boot-imx-563e53efaadd76def21612bcf9f0236d870b6e68.tar.gz u-boot-imx-563e53efaadd76def21612bcf9f0236d870b6e68.tar.bz2 | |
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/P1022DS.h')
| -rw-r--r-- | include/configs/P1022DS.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 795e3b5..0f5915d 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -688,12 +688,10 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR #define CONFIG_CMD_REGINFO #ifdef CONFIG_PCI #define CONFIG_CMD_PCI -#define CONFIG_CMD_NET #endif /* |