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/tb100_defconfig | |
| 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 'configs/tb100_defconfig')
| -rw-r--r-- | configs/tb100_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index c8a71bf0ef..c753197201 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -2,11 +2,11 @@ CONFIG_ARC=y CONFIG_ARC_CACHE_LINE_SHIFT=5 CONFIG_TARGET_TB100=y CONFIG_SYS_CLK_FREQ=500000000 -CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="abilis_tb100" +CONFIG_CMD_NET=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_DM=y |