summaryrefslogtreecommitdiffstats
path: root/include/configs/M54455EVB.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-05-20 15:57:55 -0400
committerTom Rini <trini@konsulko.com>2015-05-20 15:57:55 -0400
commit3238639d40732fe78fd62ae5e080465552e882fc (patch)
treeb9f0f8565adf69504faf56fc7032068573e5fabe /include/configs/M54455EVB.h
parentcb0892b968e52fe0d09b4d51119d8f913685ed3c (diff)
parent76ec988b062ed880ab23d0e0d4e9e6c137b55cc3 (diff)
downloadtalos-obmc-uboot-3238639d40732fe78fd62ae5e080465552e882fc.tar.gz
talos-obmc-uboot-3238639d40732fe78fd62ae5e080465552e882fc.zip
Merge git://git.denx.de/u-boot-net
Diffstat (limited to 'include/configs/M54455EVB.h')
-rw-r--r--include/configs/M54455EVB.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 2288bff56d..b708001251 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -83,14 +83,11 @@
# define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
# define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
-# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
-# define CONFIG_ETH1ADDR 00:e0:0c:bc:e5:61
# define CONFIG_ETHPRIME "FEC0"
# define CONFIG_IPADDR 192.162.1.2
# define CONFIG_NETMASK 255.255.255.0
# define CONFIG_SERVERIP 192.162.1.1
# define CONFIG_GATEWAYIP 192.162.1.1
-# define CONFIG_OVERWRITE_ETHADDR_ONCE
/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
# ifndef CONFIG_SYS_DISCOVER_PHY
OpenPOWER on IntegriCloud