net: Remove all references to CONFIG_ETHADDR and friends

We really don't want boards defining fixed MAC addresses in their config
so we just remove the option to set it in a fixed way. If you must have
a MAC address that was not provisioned, then use the random MAC address
functionality.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index 5cbb39b93f89766dd51eba607ca4e77939716fec..a1f41f3519bf4ca0e2ab43fa13100309e4bd0875 100644 (file)
--- a/README
+++ b/README
@@ -2107,18 +2107,6 @@ CBFS (Coreboot Filesystem) support
                Some PHY like Intel LXT971A need extra delay after
                command issued before MII status register can be read
 
-- Ethernet address:
-               CONFIG_ETHADDR
-               CONFIG_ETH1ADDR
-               CONFIG_ETH2ADDR
-               CONFIG_ETH3ADDR
-               CONFIG_ETH4ADDR
-               CONFIG_ETH5ADDR
-
-               Define a default value for Ethernet address to use
-               for the respective Ethernet interface, in case this
-               is not determined automatically.
-
 - IP address:
                CONFIG_IPADDR
 
@@ -2873,8 +2861,8 @@ CBFS (Coreboot Filesystem) support
                completely disabled. Anybody can change or delete
                these parameters.
 
-               Alternatively, if you #define _both_ CONFIG_ETHADDR
-               _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
+               Alternatively, if you define _both_ an ethaddr in the
+               default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
                Ethernet address is installed in the environment,
                which can be changed exactly ONCE by the user. [The
                serial# is unaffected by this, i. e. it remains

diff --git a/doc/README.enetaddr b/doc/README.enetaddr
index 82c9cd5fe56f68b55c5eb50de332092468eccb08..50e4899787792246face19fcb4561afe0eafca1e 100644 (file)
--- a/doc/README.enetaddr
+++ b/doc/README.enetaddr
@@ -15,7 +15,7 @@ Here are the places where MAC addresses might be stored:
  - board-specific location (eeprom, dedicated flash, ...)
        Note: only used when mandatory due to hardware design etc...
 
- - environment ("ethaddr", "eth1addr", ...) (see CONFIG_ETHADDR)
+ - environment ("ethaddr", "eth1addr", ...)
        Note: this is the preferred way to permanently store MAC addresses
 
  - ethernet data (struct eth_device -> enetaddr)

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index a93b37a5d7dafa03ef95ae2df49576d704250561..9bc8a8d1aa1543a74923f90f605684e6281cc18a 100644 (file)
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <errno.h>
 #include <net.h>
 #include <netdev.h>
 #include <malloc.h>
@@ -653,13 +654,8 @@ int greth_initialize(bd_t * bis)
                        }
                }
        } else {
-               /* HW Address not found in environment, Set default HW address */
-               addr[0] = GRETH_HWADDR_0;       /* MSB */
-               addr[1] = GRETH_HWADDR_1;
-               addr[2] = GRETH_HWADDR_2;
-               addr[3] = GRETH_HWADDR_3;
-               addr[4] = GRETH_HWADDR_4;
-               addr[5] = GRETH_HWADDR_5;       /* LSB */
+               /* No ethaddr set */
+               return -EINVAL;
        }
 
        /* set and remember MAC address */

diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 495c0886faea75df712643f27e89a9f5c35dc2ec..c4dd01ec2aacf541531ab903d3978b4f90b62847 100644 (file)
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -725,12 +725,6 @@ static int smc_get_ethaddr(bd_t *bd, struct eth_device *dev)
 
 static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac)
 {
-#ifdef HARDCODE_MAC    /* used for testing or to supress run time warnings */
-       char hw_mac_addr[] = { 0x02, 0x80, 0xad, 0x20, 0x31, 0xb8 };
-
-       memcpy (v_rom_mac, hw_mac_addr, 6);
-       return (1);
-#else
        int i;
        SMC_SELECT_BANK(dev, 1);
        for (i=0; i<6; i++)
@@ -738,7 +732,6 @@ static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac)
                v_rom_mac[i] = SMC_inb(dev, LAN91C96_IA0 + i);
        }
        return (1);
-#endif
 }
 
 /* Structure to detect the device IDs */

diff --git a/examples/standalone/README.smc91111_eeprom b/examples/standalone/README.smc91111_eeprom
index a2d52e77703f94ebeb963d8e62213d556a78d5b7..f73a8d3a581bb6d167a2473787996f4ae3e67f48 100644 (file)
--- a/examples/standalone/README.smc91111_eeprom
+++ b/examples/standalone/README.smc91111_eeprom
@@ -27,29 +27,6 @@ To find out who has a MAC address, or to purchase MAC addresses, goto
 the IEEE, at:
 http://standards.ieee.org/regauth/oui/index.shtml
 
-To change your MAC address, there can not be a MAC address predefined in
-U-Boot. To ensure that this does not occur, check your
-include/configs/<board_name>.h file, and check to see that the following
-settings are _not_ or commented out there.
-
-#define HARDCODE_MAC                   1
-#define CONFIG_ETHADDR                 02:80:ad:20:31:b8
-
-The purpose of HARDCODE_MAC is to hardcode the MAC address in software,
-(not what we want), or to preset it to 02:80:ad:20:31:b8 (not what we
-want either).
-
-You can check this in a running U-Boot, by doing a power cycle, then
-before U-Boot tries to do any networking, running the 'printenv' command
-
-  BOOT> printenv
-
-  ethaddr=02:80:ad:20:31:b8
-
-If you see the 'ethaddr' variable show up, like the above, you need to
-recompile U-Boot, with the above settings commented out of the
-include/configs/<board_name>.h file.
-
 2. Running the smc91111_eeprom program
 ---------------------------------------------------------------------
 

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 7eac03baaf2dcbd75f2a04bc759b0880e9c41ca0..d0f4d758b77bbd26829375a4095e760840423e6c 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -74,12 +74,10 @@
 #define CONFIG_UDP_CHECKSUM
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME                M5208EVBe

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 4bba81544fd67181ff6bfcb4a358b1f1defd77e9..a76632494c6a764b4dae18a70afefcef6e06da9f 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -95,12 +95,10 @@
 #define CONFIG_BOOTDELAY       1       /* autoboot after 5 seconds */
 #define CONFIG_BOOTFILE                "u-boot.bin"
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* FEC_ENET */
 
 #define CONFIG_HOSTNAME                M5235EVB

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 159d2f8ced3e2173517476db8eebeb2a758c77cf..9946108c1299d9ac96b8905ba67c39dbd6279784 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -94,12 +94,10 @@
 #endif
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME                M5272C3

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index bc740ae9058b486a27346f9890b4defd11acfe9d..4d3390b1f0f6c3d5b35cf5092fd5568f8fa3c460 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -80,12 +80,10 @@
 
 #define CONFIG_BOOTDELAY       5
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME                M5282EVB

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 082970841245b820ebf01e1ad1fab4853a2f01ed..e2dd8e555512cb01b045944eea49663922391c7e 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -94,13 +94,10 @@
 #define CONFIG_UDP_CHECKSUM
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
-#      define CONFIG_ETH1ADDR  00:e0:0c:bc:e5:61
 #      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
 #endif                         /* FEC_ENET */
 
 #define CONFIG_HOSTNAME                M53017

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index a42b5f6b475c0e706d6d2e4a8b60f3d83b511b22..5a7597c2398e488aa04c707ee4bfaddb0ab5f930 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -88,12 +88,10 @@
 #define CONFIG_UDP_CHECKSUM
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* FEC_ENET */
 
 #define CONFIG_HOSTNAME                M5329EVB

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index c142dfbe238067544936befc6a66130adf73f4ff..7550c571b80a0c7269274fe9da6fec12aa308c5c 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -88,12 +88,10 @@
 #define CONFIG_UDP_CHECKSUM
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* FEC_ENET */
 
 #define CONFIG_HOSTNAME                M5373EVB

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 3a6e9811d51e02a61db20d0164770e3a01b872d7..25b3cdac4228b18a41cc7aef7032f2414cbdaeae 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -113,15 +113,12 @@
                                "::eth0:off:rw console=ttyS0,115200"
 #endif
 
-#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.168.1.2
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_SERVERIP        192.168.1.1
 #define CONFIG_GATEWAYIP       192.168.1.1
 
-#define CONFIG_OVERWRITE_ETHADDR_ONCE
 #define CONFIG_SYS_FEC_BUF_USE_SRAM
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 1b3598a092cfa3d95b75e92f241ea8f5f1e9622d..f3cade380e4e27ed134148bafc708af1cf83e3ce 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -77,13 +77,11 @@
 
 #      define CONFIG_BOOTDELAY 1       /* autoboot after 5 seconds */
 #      define CONFIG_BOOTARGS          "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)"
-#      define CONFIG_ETHADDR           00:e0:0c:bc:e5:60
 #      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

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 2288bff56d42e7d08e051102f799a480ed416b71..b70800125115f01182f70b49f5c9465bc65fb2a3 100644 (file)
--- 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

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 91d6a1ada92e35c2cfc6c146b02f9e29a158f7cf..658c170c92ebbdc412f0c8d66c55323119f34e81 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -75,13 +75,10 @@
 #              endif
 #      endif                   /* CONFIG_SYS_DISCOVER_PHY */
 
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
-#      define CONFIG_ETH1ADDR  00:e0:0c:bc:e5:61
 #      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
 
 #endif
 
@@ -135,12 +132,10 @@
 #define CONFIG_UDP_CHECKSUM
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
 #      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
 #endif                         /* FEC_ENET */
 
 #define CONFIG_HOSTNAME                M547xEVB

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index ce9f3b01b2e530ea82e7bdbee163df74a6d8421e..efb64a14ce56726c3552d67941eed640340f223d 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -75,13 +75,10 @@
 #              endif
 #      endif                   /* CONFIG_SYS_DISCOVER_PHY */
 
-#      define CONFIG_ETHADDR   00:e0:0c:bc:e5:60
-#      define CONFIG_ETH1ADDR  00:e0:0c:bc:e5:61
 #      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
 
 #endif
 

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index dc09b1f8704725e3c095268578e72b84ed544b48..d41eeb59b6f7beee4f78cc0e1c9479cdac9bdeee 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -720,13 +720,9 @@
 /* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR        00:E0:0C:02:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR        00:E0:0C:02:02:FD
 #define CONFIG_HAS_ETH3
-#define CONFIG_ETH3ADDR        00:E0:0C:02:03:FD
 #endif
 
 #define CONFIG_IPADDR          192.168.1.254

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 37c2b9415af9fb040d1c1f7410d97b688c7c40a7..b388168a1117a4128fc0643c17bb61a01839deb9 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -12,7 +12,7 @@
  * Please refer to doc/README.mpc85xx for more info.
  *
  * Make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
+ * search for CONFIG_SERVERIP, etc in this file.
  */
 
 #ifndef __CONFIG_H
@@ -406,11 +406,8 @@
 /* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR   00:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR  00:E0:0C:00:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR  00:E0:0C:00:02:FD
 #endif
 
 #define CONFIG_IPADDR    192.168.1.253

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 5d229a0d204611a2d23f94ea13c48cfcef356dac..609c5bb3be1534dfe7ad71918d716f2643f3bd40 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -418,11 +418,8 @@ extern unsigned long get_clock_freq(void);
 /* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR   00:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR  00:E0:0C:00:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR  00:E0:0C:00:02:FD
 #endif
 
 #define CONFIG_IPADDR    192.168.1.253

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index dade6d3b89cd18556c77adebec6597a73f3def3b..479589e3854ba4d9d32f2d2f68c93db5fd4c69ea 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -449,9 +449,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR        00:E0:0C:02:01:FD
 #endif
 
 #define CONFIG_IPADDR  192.168.1.251

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 190c668303a662533df6d625bd8cf914c1e01e6c..fb28512340979af660e53dd9bab19014dd692b94 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -539,17 +539,11 @@ extern unsigned long get_clock_freq(void);
 /*
  * Environment Configuration
  */
-
-/* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR  00:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR         00:E0:0C:00:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR         00:E0:0C:00:02:FD
 #define CONFIG_HAS_ETH3
-#define CONFIG_ETH3ADDR         00:E0:0C:00:03:FD
 #endif
 
 #define CONFIG_IPADDR   192.168.1.253

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 5263ffcc8d6f32cfa1652731e407e541fbf40d5b..48b55b59e3a0e810d4e28ffe2d1158df9a3f5dbb 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -412,15 +412,10 @@ extern unsigned long get_clock_freq(void);
 /*
  * Environment Configuration
  */
-
-/* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR   00:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR  00:E0:0C:00:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR  00:E0:0C:00:02:FD
 #endif
 
 #define CONFIG_IPADDR    192.168.1.253

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index ac78d481d68ce2980b652fc2b8ee3e00837e40e4..92f0b7fe303a4e362d111c2e43fb8116a87ed21f 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -12,7 +12,7 @@
  * Please refer to doc/README.mpc85xx for more info.
  *
  * Make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
+ * search for CONFIG_SERVERIP, etc. in this file.
  */
 
 #ifndef __CONFIG_H
@@ -443,17 +443,11 @@
 /*
  * Environment Configuration
  */
-
-/* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR   00:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR  00:E0:0C:00:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR  00:E0:0C:00:02:FD
 #define CONFIG_HAS_ETH3
-#define CONFIG_ETH3ADDR  00:E0:0C:00:03:FD
 #endif
 
 #define CONFIG_IPADDR    192.168.1.253

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 02a5acf38ea3fd533a286bef83365727d35d04e6..57fc37b9bcd354eccb979fa57d3591803cdab960 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -438,13 +438,9 @@ extern unsigned long get_clock_freq(void);
 /* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_UEC_ETH)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR   00:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR  00:E0:0C:00:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR  00:E0:0C:00:02:FD
 #define CONFIG_HAS_ETH3
-#define CONFIG_ETH3ADDR  00:E0:0C:00:03:FD
 #endif
 
 #define CONFIG_IPADDR    192.168.1.253

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 5e7bc49dcf4a7bf2da8424d95ec75fe3d6935ac4..7b3ddbadf293063f0d1c86994f0d5b8b8f779cf8 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -658,17 +658,11 @@
 /*
  * Environment Configuration
  */
-
-/* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR        00:E0:0C:02:01:FD
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR        00:E0:0C:02:02:FD
 #define CONFIG_HAS_ETH3
-#define CONFIG_ETH3ADDR        00:E0:0C:02:03:FD
 #endif
 
 #define CONFIG_IPADDR          192.168.1.254

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index e6d570a6af09429d7ec58dfeb3fa710e4e3ed0e3..cae133bf588dfa254c55a827b03b937a696c6a92 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -300,7 +300,6 @@
 
 #define CONFIG_ULI526X
 #ifdef CONFIG_ULI526X
-#define CONFIG_ETHADDR   00:E0:0C:00:00:01
 #endif
 
 /************************************************************

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 9f755e50fcdaeeef4858f5ea3ab0d6fbda13d9a1..938874fe4240f7439dc00a6df025fb9be9a07c17 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -10,7 +10,7 @@
  * MPC8641HPCN board configuration file
  *
  * Make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
+ * search for CONFIG_SERVERIP, etc. in this file.
  */
 
 #ifndef __CONFIG_H
@@ -679,14 +679,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * Environment Configuration
  */
 
-/* The mac addresses for all ethernet interface */
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_ETHADDR  00:E0:0C:00:00:01
-#define CONFIG_ETH1ADDR  00:E0:0C:00:01:FD
-#define CONFIG_ETH2ADDR  00:E0:0C:00:02:FD
-#define CONFIG_ETH3ADDR  00:E0:0C:00:03:FD
-#endif
-
 #define CONFIG_HAS_ETH0                1
 #define CONFIG_HAS_ETH1                1
 #define CONFIG_HAS_ETH2                1

diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 3c6765560e8cbdea6222b11f503078d77d9ca086..00589b7e682b222309156da0488dd707e1046ead 100644 (file)
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -165,7 +165,6 @@
                        "setenv bootargs ${bootargs} no_ethaddr;"       \
                "fi\0"                                                  \
        "hostname=CPUP0\0"                                              \
-       "ethaddr=00:00:00:00:00:00\0"                                   \
        "netdev=eth0\0"                                                 \
        "bootcmd=run bootcmd_nor\0"                                     \
        ""

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 2e0e9224cfa04407a00b0275bea5fef431694076..0d9fe57ba95652195219a220c2138873aeab94b1 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -73,8 +73,6 @@
 #define CONFIG_GATEWAYIP       192.168.233.1
 #define CONFIG_SERVERIP                192.168.233.53
 #define CONFIG_ROOTPATH                "/romfs/brettl2"
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 #endif
 

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 50e85ca93c1126eca7094bdec57bceb3e3c9d0f8..dcd19e4db8a94fe940d4af5f7e33b4e8ba0471a6 100644 (file)
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -87,8 +87,6 @@
 #endif
 #define CONFIG_HOSTNAME                bf518f-ezbrd
 #define CONFIG_PHY_ADDR                3
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 7fc882a133b4e3c4b622dd8031e0dc9b3c0c5bc1..ad5fa53160043b74a68e8f3d194405fbe03eb132 100644 (file)
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -85,8 +85,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf526-ezbrd
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 79e440a0be4780bb05181f735c328508ae7b8dba..b23a250e0aee9d43c58e02e738d20e28c66c506b 100644 (file)
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -83,8 +83,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf527-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 0fda967ac24ac2b183cbdec0e87ae3ed48dbf8d4..1b7290e8d74c483904304baf73c7c21e29d30583 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -75,8 +75,6 @@
                SSYNC(); \
        } while (0)
 #define CONFIG_HOSTNAME                bf533-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index ae4d83a8f1430265f4d2ed6e0c5b8ad5214d02f4..322705decbea0e711de0def34bfe5b2696c4806c 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -68,8 +68,6 @@
                SSYNC(); \
        } while (0)
 #define CONFIG_HOSTNAME                bf533-stamp
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:b8 */
 
 
 /* I2C */

diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 6df89af402985004962cbdac8b147c9f4c05900e..6092f243b9a83dfeb8769614fbdc635acf8d0a0c 100644 (file)
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -86,8 +86,6 @@
 
 #define CONFIG_SYS_AUTOLOAD    "no"
 #define CONFIG_ROOTPATH                "/romfs"
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:42 */
 
 #define CONFIG_LIB_RAND
 

diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 4f2b2cbf296a8fe25e124caa99f2de4fec07b63c..e853b7dd73cc180e9eef563998a0d78c4d5c59c7 100644 (file)
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -65,8 +65,6 @@
 #define CONFIG_RMII
 #endif
 #define CONFIG_HOSTNAME                bf537-pnav
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:24:21:18 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index d01d88f3b47cc673af67f5dd079fe8cad2ff76e1..ba2ea2a27a4a89ba8c42582ef2b37c53ebb5eef9 100644 (file)
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -86,8 +86,6 @@
 
 #define CONFIG_SYS_AUTOLOAD    "no"
 #define CONFIG_ROOTPATH                "/romfs"
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:42 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 7b5a5a7f71dfb3c4a71e817f49c024cf7e1ab69d..41f1b1f071c7847ca4b8c8eee4ec16da68576acd 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -65,8 +65,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf537-stamp
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index e60558e1b62f838b524c663d4253606559ad486c..3c82bf270165187ec26a34732810aac0d4806838 100644 (file)
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -63,8 +63,6 @@
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20310300
 #define CONFIG_HOSTNAME                bf538f-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index e71e6d324cda769a743a4d3b01bef34c956031be..53f655890f56fe557ee3f517c37f12bcb45d74b3 100644 (file)
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -73,8 +73,6 @@
 #define CONFIG_SMC911X_BASE    0x24000000
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_HOSTNAME                bf548-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 6871d8c422265308d6955c51ac5779de9525efd0..03f3cec9dbb03ea6c051da7c2d9828563164eadf 100644 (file)
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -92,9 +92,6 @@
 
 #define CONFIG_HOSTNAME                bf561-acvilon
 
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR                              02:80:ad:20:31:e8 */
-
 
 /*
  * Flash Settings

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index fb6f94873af222f5e4d25a4790bf647ff0c42e0a..efbc6c21d9555df87c5a6e9239b40804863f74cb 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -64,8 +64,6 @@
 #define CONFIG_SMC91111_BASE   0x2C010300
 #define CONFIG_SMC_USE_32_BIT  1
 #define CONFIG_HOSTNAME                bf561-ezkit
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 7de425349fb46be5b00ffb9f1bd590f49d423f13..28bc653442b8e7ff92c2cfce3ee236b68a8d875e 100644 (file)
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -76,9 +76,6 @@
 #define CONFIG_HOSTNAME                blackstamp
 #define CONFIG_ROOTPATH                "/checkout/uClinux-dist/romfs"
 #define CONFIG_SYS_AUTOLOAD            "no"
-
-/* To remove hardcoding and enable MAC storage in EEPROM  */
-/* #define CONFIG_ETHADDR              02:80:ad:20:31:b8 */
 #endif
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH

diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 6e5774c6ba5fc29abcf309a0771c7ea8940d11b5..27dccf65c425e6af5083daf1b13ef3c42faddc92 100644 (file)
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -85,9 +85,6 @@
 #define CFG_AUTOLOAD           "no"
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_ENV_OVERWRITE   1       /* enable changing MAC at runtime */
-/* Comment out hardcoded MAC to enable MAC storage in EEPROM */
-/* # define CONFIG_ETHADDR     ff:ee:dd:cc:bb:aa */
 
 /*
  * SDRAM settings & memory map

diff --git a/include/configs/br4.h b/include/configs/br4.h
index 48cf184826d979b0e93f796faf999b97ac0db92b..a44c18c66e1efc368db7b1e61c8dbd14b5131a52 100644 (file)
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -69,9 +69,6 @@
 #endif
 #define CONFIG_HOSTNAME                br4
 #define CONFIG_TFTP_BLOCKSIZE  4404
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      5c:38:1a:80:a7:00 */
-
 
 /*
  * Flash Settings

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 643c8379aad6207877321826ef5fecd74a341206..387f1cb767438a47fbb4a0b5af65154a41605966 100644 (file)
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -83,8 +83,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf527
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index 485f01a01c04f6f76bdd2e7e39d6cf6eb06679d1..a4647858dd2a4fc1c8de1f40297279cde62c6a92 100644 (file)
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -66,8 +66,6 @@
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20200300
 #define CONFIG_HOSTNAME                cm-bf533
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index e05956846c92436ae2281605807fc068d9e8b0b8..95afd512171f0c5b12fcc7c5952c1c76a0f8d46b 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -71,8 +71,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537e
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 1f26457a955abc3ec96c3c2f5814d477fd4924b7..4df4a05c7ddaeb00393b2443d2147bafb83e9a68 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -69,8 +69,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537u
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index 72eafc5699b57f5dc578fad441a733f4a66b21e5..cde23ada40001e35e8e426f3559c9cc321c4106f 100644 (file)
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -76,8 +76,6 @@
 #define CONFIG_SMC911X_BASE    0x24000000
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_HOSTNAME                cm-bf548
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:24:31:91 */
 
 
 /*

diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 96910a7afd27cab60ddbc1241277b20c01a32088..9d8a2c613fee45ecb79e596a1571b697f08b315e 100644 (file)
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -67,8 +67,6 @@
 #define CONFIG_SMC911X_BASE    0x24008000 /* AMS1 */
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_HOSTNAME                cm-bf561
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:cf */
 
 
 /*

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 38fcc40d9fea39540e900f7544a5fe713d3e56b9..11dd4d712be372533e64fb2f008e7d3063b97f0e 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -177,7 +177,6 @@ considered during boot */
 
 /* User network settings */
 
-#define CONFIG_ETHADDR 00:00:00:00:00:09       /* default ethernet MAC addr. */
 #define CONFIG_IPADDR 192.168.100.2            /* default board IP address */
 #define CONFIG_SERVERIP 192.168.100.1  /* default tftp server IP address */
 

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 56317ef5e705a5cf3bccad1a9ae1a9383848da36..70aa699c4a98ad3af6bb2764155af3af85245ede 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -37,8 +37,6 @@
 #endif
 #endif
 
-#define CONFIG_ETHADDR         DE:AD:BE:EF:01:01    /* Ethernet address */
-
 #define CONFIG_BOOTDELAY       2       /* autoboot after 2 seconds     */
 
 #define CONFIG_BAUDRATE                115200

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index ae89368bfba18b9738976e74fd85401b4b328e43..fc02b30af73cbf505640ed766a2aa1786f16bed1 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -242,7 +242,6 @@
        "rootpath=/opt/eldk/arm\0"                                      \
        "splashpos=230,180\0"                                           \
        "testrfspath=/opt/eldk/test_arm\0"                              \
-       "tempmac=setenv ethaddr 02:ea:20:ff:ff:ff\0"                    \
        "nandargs=setenv bootargs rootfstype=ubifs ro chk_data_crc "    \
        "ubi.mtd=${as} root=ubi0:rootfs\0"                              \
        "nandrwargs=setenv bootargs rootfstype=ubifs rw chk_data_crc "  \
@@ -315,6 +314,6 @@
                "fi;"                                                   \
                "else echo U-Boot not downloaded..exiting;fi\0" \
        "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0"    \
-       "bootcmd=run tempmac;run net_testrfs\0"
+       "bootcmd=run net_testrfs\0"
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 854807d486846ee9f0525e8209e4998bd88899a6..5d28d8bf081ffc654b516085015197db38d9adc7 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -280,7 +280,6 @@
 /*#define CONFIG_SHOW_ACTIVITY*/
 #define CONFIG_NET_RETRY_COUNT         10      /* # of retries          */
 
-#define CONFIG_ETHADDR   00:00:7a:cc:00:13
 #define CONFIG_PHY_ADDR         0x00
 
 /*

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index ed2dd2a847be9e231d43c47f67ab770ee2af9132..7c320eeb64c29b94489ece916c5629dd1802e9a7 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -260,16 +260,6 @@
 /* USE GRETH Ethernet Driver */
 #define CONFIG_GRETH   1
 
-/* Default GRETH Ethernet HARDWARE address */
-#define GRETH_HWADDR_0 0x00
-#define GRETH_HWADDR_1 0x00
-#define GRETH_HWADDR_2 0x7a
-#define GRETH_HWADDR_3 0xcc
-#define GRETH_HWADDR_4 0x00
-#define GRETH_HWADDR_5 0x13
-#endif
-
-#define CONFIG_ETHADDR   00:00:7a:cc:00:13
 #define CONFIG_PHY_ADDR         0x00
 
 /*

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index e3cbb6f5965af7fa89eff870caac14a020092d6c..fdd0aa5455cbecddf4caee12e0db096c64219c2a 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -220,15 +220,6 @@
  */
 #define CONFIG_GRETH   1
 
-/* Default GRETH Ethernet HARDWARE address */
-#define GRETH_HWADDR_0 0x00
-#define GRETH_HWADDR_1 0x00
-#define GRETH_HWADDR_2 0x7a
-#define GRETH_HWADDR_3 0xcc
-#define GRETH_HWADDR_4 0x00
-#define GRETH_HWADDR_5 0x12
-
-#define CONFIG_ETHADDR   00:00:7a:cc:00:12
 #define CONFIG_PHY_ADDR         0x00
 
 /*

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 1e089a9bf7545530ed43c38ed51e79d4ed090db0..21b4f5e5d4ddd2fa6d51202cb72b9a11fb0ba328 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -94,7 +94,6 @@
        "rootpath=/export/roofs\0"                                      \
        "scratch=40000000\0"                                    \
        "getkernel=tftpboot $(scratch) $(bootfile)\0" \
-       "ethaddr=00:00:7A:CC:00:12\0" \
        "bootargs=console=ttyS0,38400" \
        ""
 #define CONFIG_NETMASK 255.255.255.0
@@ -243,16 +242,6 @@
  */
 #define CONFIG_GRETH   1
 
-/* Default HARDWARE address */
-#define GRETH_HWADDR_0 0x00
-#define GRETH_HWADDR_1 0x00
-#define GRETH_HWADDR_2 0x7A
-#define GRETH_HWADDR_3 0xcc
-#define GRETH_HWADDR_4 0x00
-#define GRETH_HWADDR_5 0x12
-
-#define CONFIG_ETHADDR   00:00:7a:cc:00:12
-
 /*
  * Define CONFIG_GRETH_10MBIT to force GRETH at 10Mb/s
  */

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 66194a8ff0e173e2a9e64caae7abeda42f6a996d..f050754a75b5e3ac9f0220ed5cb600839ddd4e56 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -91,7 +91,6 @@
        "rootpath=/export/roofs\0"                                      \
        "scratch=40000000\0"                                    \
        "getkernel=tftpboot $(scratch) $(bootfile)\0" \
-       "ethaddr=00:00:7A:CC:00:12\0" \
        "bootargs=console=ttyS0,38400" \
        ""
 #define CONFIG_NETMASK 255.255.255.0
@@ -241,16 +240,6 @@
  */
 /*#define CONFIG_GRETH 1*/
 
-/* Default HARDWARE address */
-#define GRETH_HWADDR_0 0x00
-#define GRETH_HWADDR_1 0x00
-#define GRETH_HWADDR_2 0x7A
-#define GRETH_HWADDR_3 0xcc
-#define GRETH_HWADDR_4 0x00
-#define GRETH_HWADDR_5 0x12
-
-#define CONFIG_ETHADDR   00:00:7a:cc:00:12
-
 /*
  * Define CONFIG_GRETH_10MBIT to force GRETH at 10Mb/s
  */

diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 2a937c6a2212fea8565261a919163a20222a9d40..47579296184b4db96f00eb484a2fb1e9e8419530 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -64,8 +64,6 @@
 #define CONFIG_DRIVER_AX88180  1
 #define AX88180_BASE           0x2c000000
 #define CONFIG_HOSTNAME                ibf-dsp561
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index f321975c478d681472ee0554d9f98ae95ed4caca..92587349d12419e4b035aa943869ead6d6306115 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -110,9 +110,6 @@
 
 #undef CONFIG_BOOTARGS
 
-#define        CONFIG_ETHADDR          00:a0:a4:03:00:00
-#define        CONFIG_OVERWRITE_ETHADDR_ONCE
-
 #define        CONFIG_IPADDR           192.168.100.2
 #define        CONFIG_SERVERIP         192.168.100.1
 #define        CONFIG_NETMASK          255.255.255.0

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 166ab4f05654e9e1a1a970989cb0be808c7e4c68..b84eead661ed7f7f34def37ac7c93c6e052f0595 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -350,7 +350,6 @@
 #define        CONFIG_IPADDR           192.168.0.3
 #define        CONFIG_SERVERIP         192.168.0.5
 #define        CONFIG_GATEWAYIP        192.168.0.1
-#define        CONFIG_ETHADDR          00:E0:0C:00:00:FD
 
 /* architecture dependent code */
 #define        CONFIG_SYS_USR_EXCEP    /* user exception */

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index e8b05932a13a847ee329181292c11927b6521262..4d648c8a14f8094b47018fb56b9b80f76b7f5956 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -85,8 +85,6 @@
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
 #define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
-#define CONFIG_ETHADDR         00:50:C2:40:10:00
-#define CONFIG_OVERWRITE_ETHADDR_ONCE  1
 #define CONFIG_VERSION_VARIABLE        1       /* include version env variable */
 
 /*

diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 3030054949f8fdea5228b616bee0811cfb5e667e..20826790fa9437b598e63a3e4a1156bed3c4e039 100644 (file)
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -90,7 +90,6 @@
        "machid=ffffffff\0" \
        "fdt_high=0x87000000\0" \
        "baudrate=115200\0" \
-       "ethaddr=00:50:C2:7E:90:F0\0" \
        "fec_addr=00:50:C2:7E:90:F0\0" \
        "netmask=255.255.255.0\0" \
        "ipaddr=192.168.2.9\0" \

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index a1926bb64d08115a4447f24d316ee253a2de202e..2508702a4a1448c1fcf0836ebf3e4bc363ec6b27 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -31,8 +31,6 @@
 #endif
 #endif
 
-#define CONFIG_ETHADDR         DE:AD:BE:EF:01:01    /* Ethernet address */
-
 #define CONFIG_BOOTDELAY       2       /* autoboot after 2 seconds     */
 
 #define CONFIG_BAUDRATE                115200

diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 13fb675a5fdc9033123ebb4bb585eb0d98a9590a..b9253b96844a9bfd7512242bd331edd33f88c1a3 100644 (file)
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -69,8 +69,6 @@
 #endif
 #define CONFIG_HOSTNAME                pr1
 #define CONFIG_TFTP_BLOCKSIZE  4404
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 69dc210917802a3d0bdd85f3c315f27701396bc0..11bf5048324989dea5ed732bb6425aa32c189918 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -102,7 +102,6 @@
 
 #define CONFIG_SDRAM_BANK0     1       /* init onboard SDRAM bank 0    */
 
-#define CONFIG_ETHADDR DE:AD:BE:EF:01:01       /* Ethernet address     */
 #define CONFIG_IPADDR          192.168.193.102
 #define CONFIG_NETMASK         255.255.255.224
 #define CONFIG_SERVERIP                192.168.193.119

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index aee0d9e273097b7a92bd43c4aa72a5b6d1f5f87b..5b373cb0f1e0bd7afe4dd39af7b7080659c78191 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -581,13 +581,9 @@
 /*
  * Environment Configuration
  */
-
-/* The mac addresses for all ethernet interface */
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR  02:E0:0C:00:00:FD
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR         02:E0:0C:00:01:FD
 #endif
 
 #define CONFIG_IPADDR   192.168.0.55

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 8eb7276618b0ac793b37eecdf8af9491283883d1..021da50aa83144f37dc27f3850d82334f223b3e2 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -14,7 +14,7 @@
  * SBC8641D board configuration file
  *
  * Make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
+ * search for CONFIG_SERVERIP, etc in this file.
  */
 
 #ifndef __CONFIG_H
@@ -528,14 +528,6 @@
  * Environment Configuration
  */
 
-/* The mac addresses for all ethernet interface */
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_ETHADDR   02:E0:0C:00:00:01
-#define CONFIG_ETH1ADDR  02:E0:0C:00:01:FD
-#define CONFIG_ETH2ADDR  02:E0:0C:00:02:FD
-#define CONFIG_ETH3ADDR  02:E0:0C:00:03:FD
-#endif
-
 #define CONFIG_HAS_ETH0                1
 #define CONFIG_HAS_ETH1                1
 #define CONFIG_HAS_ETH2                1

diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index f4a40bb9324717e8b83501b09bb3183a976f587a..6cac99e0428d7a897f8537dd2b21b59803fdd56c 100644 (file)
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -50,7 +50,6 @@
 #define CONFIG_BOOTARGS           "console=ttySMX0,115200n8 root=/dev/mtdblock3 rootfstype=jffs2 mtdparts=scb9328_flash:128k(U-boot)ro,128k(U-boot_env),1m(kernel),4m(root),4m(fs) eval_board=evk9328"
 #define CONFIG_BOOTCOMMAND "bootm 10040000"
 #define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_ETHADDR         80:81:82:83:84:85
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_IPADDR          10.10.10.9
 #define CONFIG_SERVERIP                10.10.10.10

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index b6a5e6a59c98cadc2abb045d0e64756c7d8b1953..623be7d39bcf1b9869f2c6f611ac5ab037281b09 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -100,15 +100,6 @@
 #if defined(CONFIG_SYS_RAMBOOT)
 #define CONFIG_ENV_IS_NOWHERE          /* Store env in memory only     */
 #define CONFIG_ENV_SIZE                (8 << 10)
-/*
- * In RAM-booting version, we have no environment storage. So we need to
- * provide at least preliminary MAC addresses for the 4xx EMAC driver to
- * register the interfaces. Those two addresses are generated via the
- * tools/gen_eth_addr tool and should only be used in a closed laboratory
- * environment.
- */
-#define        CONFIG_ETHADDR          4a:56:49:22:3e:43
-#define        CONFIG_ETH1ADDR         02:93:53:d5:06:98
 #else
 #define CONFIG_ENV_IS_IN_FLASH         /* use FLASH for environ vars   */
 #endif

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 5fb40ebf8ba534e791b02d79a596b4a12c7bc67b..a0817a0f80acbc870c5f89080c3eec43a7b2cb30 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -13,7 +13,7 @@
 /* mpc8560ads board configuration file */
 /* please refer to doc/README.mpc85xx for more info */
 /* make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
+ * search for CONFIG_SERVERIP, etc. in this file
  */
 
 #ifndef __CONFIG_H
@@ -342,14 +342,10 @@
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #endif
 
-/*Note: change below for your network setting!!! */
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR          00:e0:0c:07:9b:8a
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR                 00:e0:0c:07:9b:8b
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR                 00:e0:0c:07:9b:8c
 #endif
 
 #define CONFIG_SERVERIP                192.168.85.1

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 914d82190597110e9b2d23e01ba8c2ef10bb3085..78ac0801d58cec1bb367d147e8c1ab9a10a15507 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -13,7 +13,7 @@
 /* mpc8560ads board configuration file */
 /* please refer to doc/README.mpc85xx for more info */
 /* make sure you change the MAC address and other network params first,
- * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
+ * search for CONFIG_SERVERIP, etc. in this file
  */
 
 #ifndef __CONFIG_H
@@ -377,14 +377,10 @@
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #endif
 
-/*Note: change below for your network setting!!! */
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR  00:e0:0c:07:9b:8a
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR  00:e0:0c:07:9b:8b
 #define CONFIG_HAS_ETH2
-#define CONFIG_ETH2ADDR  00:e0:0c:07:9b:8c
 #endif
 
 /*

diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index e96a7427e5864c64280e0c3dc2eb38f0645ef484..d4c89b6fce662f419b9cc9c890385d6f7c841317 100644 (file)
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -66,8 +66,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf518
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 42129fb7d8419e83ca2eb3883c5e6cd31a60ba39..33265801a6bbbe98c84f6019f00a046f60cb7969 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -71,8 +71,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf537
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 #define CONFIG_LIB_RAND
 
 /*

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index d4688c54bab94125009ff8db8d71539c801be19d..331df6251a4db7fbe992413345b465ab466275d5 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -209,7 +209,6 @@
 /*
  * Network Configuration
  */
-#define CONFIG_ETHADDR                 00:21:83:24:00:00
 #define CONFIG_SERVERIP                        192.168.11.1
 #define CONFIG_IPADDR                  192.168.11.10
 #define CONFIG_GATEWAYIP               192.168.11.1

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 7f6b0c7cb2650e7675150dabe1f0792b3eb2336c..688d60e8fb97be1ee2b5b796cf2c36c55f13563e 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -148,7 +148,6 @@
        "netmask=255.255.0.0\0"                                         \
        "ipaddr=192.168.160.18\0"                                       \
        "serverip=192.168.1.1\0"                                        \
-       "ethaddr=00:e0:ee:00:05:2e\0"                                   \
        "bootfile=/tftpboot/v38b/uImage\0"                              \
        "u-boot=/tftpboot/v38b/u-boot.bin\0"                            \
        ""

diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index dc8e99fffdfad8a945d766d808ddd844d0b3e1c3..4725fc3d895116988d9ddd7fd521af99e74b420b 100644 (file)
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -176,17 +176,6 @@
 #define CONFIG_ENV_OFFSET_REDUND       0x00120000
 #define CONFIG_ENV_ADDR                        0x80000100
 
-/*
- * Provide default ethernet address
- *
- * THIS IS NORMALLY NOT DONE. HERE WE KEEP WHAT WAS IN THE PORTED
- * BOARD CONFIG IN CASE SOME PROVISIONING PROCESS OUT THERE EXPECTS
- * THIS MAC ADDRESS WHEN THE DEVICE HAS STILL ITS DEFAULT CONFIG.
- */
-
-#define CONFIG_ETHADDR                 00:12:B4:00:AF:FE
-#define        CONFIG_OVERWRITE_ETHADDR_ONCE
-
 /*
  * U-Boot Commands
  */

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 2999d1b0f54ddd55e7473c83878c6644aec296f6..fcb76a27a273d61799abaabb6dbf27c937707e89 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -70,7 +70,6 @@
 #undef CONFIG_CMD_DTT
 
 
-#define CONFIG_ETHADDR         08:00:3e:26:0a:5b
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_IPADDR          192.168.68.201
 #define CONFIG_SERVERIP                192.168.68.62

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 4d7a7fc75559af286beb52e5263ef846d76d2a98..9ac4a0f04a81fc9bb58e899832f5c68037c38ae7 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -296,8 +296,6 @@
 #define CONFIG_IPADDR          192.168.1.10
 #define CONFIG_SERVERIP                192.168.1.100
 #define CONFIG_GATEWAYIP       192.168.1.100
-#define CONFIG_ETHADDR         50:00:00:00:06:00
-#define CONFIG_ETH1ADDR                50:00:00:00:06:01
 #if 0
 #define CONFIG_BOOTDELAY       -1      /* autoboot disabled        */
 #else

diff --git a/include/env_default.h b/include/env_default.h
index 90431beb192db11a16fef8ba8108a65ef5b19392..3096576836addf602971e6ea492c9588d55d9a31 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -49,24 +49,6 @@ const uchar default_environment[] = {
 #ifdef CONFIG_LOADS_ECHO
        "loads_echo="   __stringify(CONFIG_LOADS_ECHO)  "\0"
 #endif
-#ifdef CONFIG_ETHADDR
-       "ethaddr="      __stringify(CONFIG_ETHADDR)     "\0"
-#endif
-#ifdef CONFIG_ETH1ADDR
-       "eth1addr="     __stringify(CONFIG_ETH1ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH2ADDR
-       "eth2addr="     __stringify(CONFIG_ETH2ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH3ADDR
-       "eth3addr="     __stringify(CONFIG_ETH3ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH4ADDR
-       "eth4addr="     __stringify(CONFIG_ETH4ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH5ADDR
-       "eth5addr="     __stringify(CONFIG_ETH5ADDR)    "\0"
-#endif
 #ifdef CONFIG_ETHPRIME
        "ethprime="     CONFIG_ETHPRIME                 "\0"
 #endif