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/exynos4-common.h | |
parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (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/exynos4-common.h')
-rw-r--r-- | include/configs/exynos4-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index dbe05e433e..f6b0a6ff2b 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -24,14 +24,12 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_XIMG #undef CONFIG_CMD_ONENAND #undef CONFIG_CMD_MTDPARTS #define CONFIG_CMD_DFU #define CONFIG_CMD_GPT -#define CONFIG_CMD_SETEXPR /* USB Composite download gadget - g_dnl */ #define CONFIG_USBDOWNLOAD_GADGET |