summaryrefslogtreecommitdiff
path: root/configs/M5475CFE_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-01 20:47:23 (GMT)
committerTom Rini <trini@konsulko.com>2015-06-02 12:53:41 (GMT)
commit563e53efaadd76def21612bcf9f0236d870b6e68 (patch)
tree0d66d466f2c9a4cd1f6356fe889a60429745ec13 /configs/M5475CFE_defconfig
parent656ae05273419c344c11466de72476455793d6b6 (diff)
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a (diff)
downloadu-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 'configs/M5475CFE_defconfig')
-rw-r--r--configs/M5475CFE_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig
index d51fa15..31d2e33 100644
--- a/configs/M5475CFE_defconfig
+++ b/configs/M5475CFE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5475EVB=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
+CONFIG_CMD_NET=y