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 /configs/axs101_defconfig | |
parent | 656ae05273419c344c11466de72476455793d6b6 (diff) | |
parent | 9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff) | |
download | talos-obmc-uboot-563e53efaadd76def21612bcf9f0236d870b6e68.tar.gz talos-obmc-uboot-563e53efaadd76def21612bcf9f0236d870b6e68.zip |
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 'configs/axs101_defconfig')
-rw-r--r-- | configs/axs101_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index d33cc00c91..61c56e688d 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_ARC_CACHE_LINE_SHIFT=5 CONFIG_TARGET_AXS101=y CONFIG_SYS_CLK_FREQ=750000000 -CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_CMD_NET=y CONFIG_ETH_DESIGNWARE=y |