Eric Lee / smarc-uboot

144
Download as
Browse Code ยป

Commit 92ac520821405e196c920d60921bdfa5ab6b878c

Authored by Joe Hershberger
1 parent bef1014b31
Exists in v2017.01-smarct4x and in 34 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 82 changed files with 13 additions and 317 deletions Side-by-side Diff

... ... @@ -2107,18 +2107,6 @@
2107 2107 Some PHY like Intel LXT971A need extra delay after
2108 2108 command issued before MII status register can be read
2109 2109  
2110   -- Ethernet address:
2111   - CONFIG_ETHADDR
2112   - CONFIG_ETH1ADDR
2113   - CONFIG_ETH2ADDR
2114   - CONFIG_ETH3ADDR
2115   - CONFIG_ETH4ADDR
2116   - CONFIG_ETH5ADDR
2117   -
2118   - Define a default value for Ethernet address to use
2119   - for the respective Ethernet interface, in case this
2120   - is not determined automatically.
2121   -
2122 2110 - IP address:
2123 2111 CONFIG_IPADDR
2124 2112  
... ... @@ -2873,8 +2861,8 @@
2873 2861 completely disabled. Anybody can change or delete
2874 2862 these parameters.
2875 2863  
2876   - Alternatively, if you #define _both_ CONFIG_ETHADDR
2877   - _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
  2864 + Alternatively, if you define _both_ an ethaddr in the
  2865 + default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
2878 2866 Ethernet address is installed in the environment,
2879 2867 which can be changed exactly ONCE by the user. [The
2880 2868 serial# is unaffected by this, i. e. it remains
... ... @@ -15,7 +15,7 @@
15 15 - board-specific location (eeprom, dedicated flash, ...)
16 16 Note: only used when mandatory due to hardware design etc...
17 17  
18   - - environment ("ethaddr", "eth1addr", ...) (see CONFIG_ETHADDR)
  18 + - environment ("ethaddr", "eth1addr", ...)
19 19 Note: this is the preferred way to permanently store MAC addresses
20 20  
21 21 - ethernet data (struct eth_device -> enetaddr)
... ... @@ -12,6 +12,7 @@
12 12  
13 13 #include <common.h>
14 14 #include <command.h>
  15 +#include <errno.h>
15 16 #include <net.h>
16 17 #include <netdev.h>
17 18 #include <malloc.h>
... ... @@ -653,13 +654,8 @@
653 654 }
654 655 }
655 656 } else {
656   - /* HW Address not found in environment, Set default HW address */
657   - addr[0] = GRETH_HWADDR_0; /* MSB */
658   - addr[1] = GRETH_HWADDR_1;
659   - addr[2] = GRETH_HWADDR_2;
660   - addr[3] = GRETH_HWADDR_3;
661   - addr[4] = GRETH_HWADDR_4;
662   - addr[5] = GRETH_HWADDR_5; /* LSB */
  657 + /* No ethaddr set */
  658 + return -EINVAL;
663 659 }
664 660  
665 661 /* set and remember MAC address */
drivers/net/lan91c96.c
Diff comments   View file @ 92ac520
... ... @@ -725,12 +725,6 @@
725 725  
726 726 static int get_rom_mac(struct eth_device *dev, unsigned char *v_rom_mac)
727 727 {
728   -#ifdef HARDCODE_MAC /* used for testing or to supress run time warnings */
729   - char hw_mac_addr[] = { 0x02, 0x80, 0xad, 0x20, 0x31, 0xb8 };
730   -
731   - memcpy (v_rom_mac, hw_mac_addr, 6);
732   - return (1);
733   -#else
734 728 int i;
735 729 SMC_SELECT_BANK(dev, 1);
736 730 for (i=0; i<6; i++)
... ... @@ -738,7 +732,6 @@
738 732 v_rom_mac[i] = SMC_inb(dev, LAN91C96_IA0 + i);
739 733 }
740 734 return (1);
741   -#endif
742 735 }
743 736  
744 737 /* Structure to detect the device IDs */
examples/standalone/README.smc91111_eeprom
Diff comments   View file @ 92ac520
... ... @@ -27,29 +27,6 @@
27 27 the IEEE, at:
28 28 http://standards.ieee.org/regauth/oui/index.shtml
29 29  
30   -To change your MAC address, there can not be a MAC address predefined in
31   -U-Boot. To ensure that this does not occur, check your
32   -include/configs/<board_name>.h file, and check to see that the following
33   -settings are _not_ or commented out there.
34   -
35   -#define HARDCODE_MAC 1
36   -#define CONFIG_ETHADDR 02:80:ad:20:31:b8
37   -
38   -The purpose of HARDCODE_MAC is to hardcode the MAC address in software,
39   -(not what we want), or to preset it to 02:80:ad:20:31:b8 (not what we
40   -want either).
41   -
42   -You can check this in a running U-Boot, by doing a power cycle, then
43   -before U-Boot tries to do any networking, running the 'printenv' command
44   -
45   - BOOT> printenv
46   -
47   - ethaddr=02:80:ad:20:31:b8
48   -
49   -If you see the 'ethaddr' variable show up, like the above, you need to
50   -recompile U-Boot, with the above settings commented out of the
51   -include/configs/<board_name>.h file.
52   -
53 30 2. Running the smc91111_eeprom program
54 31 ---------------------------------------------------------------------
55 32  
include/configs/M5208EVBE.h
Diff comments   View file @ 92ac520
... ... @@ -74,12 +74,10 @@
74 74 #define CONFIG_UDP_CHECKSUM
75 75  
76 76 #ifdef CONFIG_MCFFEC
77   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
78 77 # define CONFIG_IPADDR 192.162.1.2
79 78 # define CONFIG_NETMASK 255.255.255.0
80 79 # define CONFIG_SERVERIP 192.162.1.1
81 80 # define CONFIG_GATEWAYIP 192.162.1.1
82   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
83 81 #endif /* CONFIG_MCFFEC */
84 82  
85 83 #define CONFIG_HOSTNAME M5208EVBe
include/configs/M5235EVB.h
Diff comments   View file @ 92ac520
... ... @@ -95,12 +95,10 @@
95 95 #define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
96 96 #define CONFIG_BOOTFILE "u-boot.bin"
97 97 #ifdef CONFIG_MCFFEC
98   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
99 98 # define CONFIG_IPADDR 192.162.1.2
100 99 # define CONFIG_NETMASK 255.255.255.0
101 100 # define CONFIG_SERVERIP 192.162.1.1
102 101 # define CONFIG_GATEWAYIP 192.162.1.1
103   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
104 102 #endif /* FEC_ENET */
105 103  
106 104 #define CONFIG_HOSTNAME M5235EVB
include/configs/M5272C3.h
Diff comments   View file @ 92ac520
... ... @@ -94,12 +94,10 @@
94 94 #endif
95 95  
96 96 #ifdef CONFIG_MCFFEC
97   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
98 97 # define CONFIG_IPADDR 192.162.1.2
99 98 # define CONFIG_NETMASK 255.255.255.0
100 99 # define CONFIG_SERVERIP 192.162.1.1
101 100 # define CONFIG_GATEWAYIP 192.162.1.1
102   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
103 101 #endif /* CONFIG_MCFFEC */
104 102  
105 103 #define CONFIG_HOSTNAME M5272C3
include/configs/M5282EVB.h
Diff comments   View file @ 92ac520
... ... @@ -80,12 +80,10 @@
80 80  
81 81 #define CONFIG_BOOTDELAY 5
82 82 #ifdef CONFIG_MCFFEC
83   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
84 83 # define CONFIG_IPADDR 192.162.1.2
85 84 # define CONFIG_NETMASK 255.255.255.0
86 85 # define CONFIG_SERVERIP 192.162.1.1
87 86 # define CONFIG_GATEWAYIP 192.162.1.1
88   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
89 87 #endif /* CONFIG_MCFFEC */
90 88  
91 89 #define CONFIG_HOSTNAME M5282EVB
include/configs/M53017EVB.h
Diff comments   View file @ 92ac520
... ... @@ -94,13 +94,10 @@
94 94 #define CONFIG_UDP_CHECKSUM
95 95  
96 96 #ifdef CONFIG_MCFFEC
97   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
98   -# define CONFIG_ETH1ADDR 00:e0:0c:bc:e5:61
99 97 # define CONFIG_IPADDR 192.162.1.2
100 98 # define CONFIG_NETMASK 255.255.255.0
101 99 # define CONFIG_SERVERIP 192.162.1.1
102 100 # define CONFIG_GATEWAYIP 192.162.1.1
103   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
104 101 #endif /* FEC_ENET */
105 102  
106 103 #define CONFIG_HOSTNAME M53017
include/configs/M5329EVB.h
Diff comments   View file @ 92ac520
... ... @@ -88,12 +88,10 @@
88 88 #define CONFIG_UDP_CHECKSUM
89 89  
90 90 #ifdef CONFIG_MCFFEC
91   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
92 91 # define CONFIG_IPADDR 192.162.1.2
93 92 # define CONFIG_NETMASK 255.255.255.0
94 93 # define CONFIG_SERVERIP 192.162.1.1
95 94 # define CONFIG_GATEWAYIP 192.162.1.1
96   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
97 95 #endif /* FEC_ENET */
98 96  
99 97 #define CONFIG_HOSTNAME M5329EVB
include/configs/M5373EVB.h
Diff comments   View file @ 92ac520
... ... @@ -88,12 +88,10 @@
88 88 #define CONFIG_UDP_CHECKSUM
89 89  
90 90 #ifdef CONFIG_MCFFEC
91   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
92 91 # define CONFIG_IPADDR 192.162.1.2
93 92 # define CONFIG_NETMASK 255.255.255.0
94 93 # define CONFIG_SERVERIP 192.162.1.1
95 94 # define CONFIG_GATEWAYIP 192.162.1.1
96   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
97 95 #endif /* FEC_ENET */
98 96  
99 97 #define CONFIG_HOSTNAME M5373EVB
include/configs/M54418TWR.h
Diff comments   View file @ 92ac520
... ... @@ -113,15 +113,12 @@
113 113 "::eth0:off:rw console=ttyS0,115200"
114 114 #endif
115 115  
116   -#define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
117   -#define CONFIG_ETH1ADDR 00:e0:0c:bc:e5:61
118 116 #define CONFIG_ETHPRIME "FEC0"
119 117 #define CONFIG_IPADDR 192.168.1.2
120 118 #define CONFIG_NETMASK 255.255.255.0
121 119 #define CONFIG_SERVERIP 192.168.1.1
122 120 #define CONFIG_GATEWAYIP 192.168.1.1
123 121  
124   -#define CONFIG_OVERWRITE_ETHADDR_ONCE
125 122 #define CONFIG_SYS_FEC_BUF_USE_SRAM
126 123 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
127 124 #ifndef CONFIG_SYS_DISCOVER_PHY
include/configs/M54451EVB.h
Diff comments   View file @ 92ac520
... ... @@ -77,13 +77,11 @@
77 77  
78 78 # define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
79 79 # define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)"
80   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
81 80 # define CONFIG_ETHPRIME "FEC0"
82 81 # define CONFIG_IPADDR 192.162.1.2
83 82 # define CONFIG_NETMASK 255.255.255.0
84 83 # define CONFIG_SERVERIP 192.162.1.1
85 84 # define CONFIG_GATEWAYIP 192.162.1.1
86   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
87 85  
88 86 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
89 87 # ifndef CONFIG_SYS_DISCOVER_PHY
include/configs/M54455EVB.h
Diff comments   View file @ 92ac520
... ... @@ -83,14 +83,11 @@
83 83  
84 84 # define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
85 85 # define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
86   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
87   -# define CONFIG_ETH1ADDR 00:e0:0c:bc:e5:61
88 86 # define CONFIG_ETHPRIME "FEC0"
89 87 # define CONFIG_IPADDR 192.162.1.2
90 88 # define CONFIG_NETMASK 255.255.255.0
91 89 # define CONFIG_SERVERIP 192.162.1.1
92 90 # define CONFIG_GATEWAYIP 192.162.1.1
93   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
94 91  
95 92 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
96 93 # ifndef CONFIG_SYS_DISCOVER_PHY
include/configs/M5475EVB.h
Diff comments   View file @ 92ac520
... ... @@ -75,13 +75,10 @@
75 75 # endif
76 76 # endif /* CONFIG_SYS_DISCOVER_PHY */
77 77  
78   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
79   -# define CONFIG_ETH1ADDR 00:e0:0c:bc:e5:61
80 78 # define CONFIG_IPADDR 192.162.1.2
81 79 # define CONFIG_NETMASK 255.255.255.0
82 80 # define CONFIG_SERVERIP 192.162.1.1
83 81 # define CONFIG_GATEWAYIP 192.162.1.1
84   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
85 82  
86 83 #endif
87 84  
88 85  
... ... @@ -135,12 +132,10 @@
135 132 #define CONFIG_UDP_CHECKSUM
136 133  
137 134 #ifdef CONFIG_MCFFEC
138   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
139 135 # define CONFIG_IPADDR 192.162.1.2
140 136 # define CONFIG_NETMASK 255.255.255.0
141 137 # define CONFIG_SERVERIP 192.162.1.1
142 138 # define CONFIG_GATEWAYIP 192.162.1.1
143   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
144 139 #endif /* FEC_ENET */
145 140  
146 141 #define CONFIG_HOSTNAME M547xEVB
include/configs/M5485EVB.h
Diff comments   View file @ 92ac520
... ... @@ -75,13 +75,10 @@
75 75 # endif
76 76 # endif /* CONFIG_SYS_DISCOVER_PHY */
77 77  
78   -# define CONFIG_ETHADDR 00:e0:0c:bc:e5:60
79   -# define CONFIG_ETH1ADDR 00:e0:0c:bc:e5:61
80 78 # define CONFIG_IPADDR 192.162.1.2
81 79 # define CONFIG_NETMASK 255.255.255.0
82 80 # define CONFIG_SERVERIP 192.162.1.1
83 81 # define CONFIG_GATEWAYIP 192.162.1.1
84   -# define CONFIG_OVERWRITE_ETHADDR_ONCE
85 82  
86 83 #endif
87 84  
include/configs/MPC8536DS.h
Diff comments   View file @ 92ac520
... ... @@ -720,13 +720,9 @@
720 720 /* The mac addresses for all ethernet interface */
721 721 #if defined(CONFIG_TSEC_ENET)
722 722 #define CONFIG_HAS_ETH0
723   -#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
724 723 #define CONFIG_HAS_ETH1
725   -#define CONFIG_ETH1ADDR 00:E0:0C:02:01:FD
726 724 #define CONFIG_HAS_ETH2
727   -#define CONFIG_ETH2ADDR 00:E0:0C:02:02:FD
728 725 #define CONFIG_HAS_ETH3
729   -#define CONFIG_ETH3ADDR 00:E0:0C:02:03:FD
730 726 #endif
731 727  
732 728 #define CONFIG_IPADDR 192.168.1.254
include/configs/MPC8540ADS.h
Diff comments   View file @ 92ac520
... ... @@ -12,7 +12,7 @@
12 12 * Please refer to doc/README.mpc85xx for more info.
13 13 *
14 14 * Make sure you change the MAC address and other network params first,
15   - * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
  15 + * search for CONFIG_SERVERIP, etc in this file.
16 16 */
17 17  
18 18 #ifndef __CONFIG_H
19 19  
20 20  
... ... @@ -406,11 +406,8 @@
406 406 /* The mac addresses for all ethernet interface */
407 407 #if defined(CONFIG_TSEC_ENET)
408 408 #define CONFIG_HAS_ETH0
409   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
410 409 #define CONFIG_HAS_ETH1
411   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
412 410 #define CONFIG_HAS_ETH2
413   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
414 411 #endif
415 412  
416 413 #define CONFIG_IPADDR 192.168.1.253
include/configs/MPC8541CDS.h
Diff comments   View file @ 92ac520
... ... @@ -418,11 +418,8 @@
418 418 /* The mac addresses for all ethernet interface */
419 419 #if defined(CONFIG_TSEC_ENET)
420 420 #define CONFIG_HAS_ETH0
421   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
422 421 #define CONFIG_HAS_ETH1
423   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
424 422 #define CONFIG_HAS_ETH2
425   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
426 423 #endif
427 424  
428 425 #define CONFIG_IPADDR 192.168.1.253
include/configs/MPC8544DS.h
Diff comments   View file @ 92ac520
... ... @@ -449,9 +449,7 @@
449 449 /* The mac addresses for all ethernet interface */
450 450 #if defined(CONFIG_TSEC_ENET)
451 451 #define CONFIG_HAS_ETH0
452   -#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
453 452 #define CONFIG_HAS_ETH1
454   -#define CONFIG_ETH1ADDR 00:E0:0C:02:01:FD
455 453 #endif
456 454  
457 455 #define CONFIG_IPADDR 192.168.1.251
include/configs/MPC8548CDS.h
Diff comments   View file @ 92ac520
... ... @@ -539,17 +539,11 @@
539 539 /*
540 540 * Environment Configuration
541 541 */
542   -
543   -/* The mac addresses for all ethernet interface */
544 542 #if defined(CONFIG_TSEC_ENET)
545 543 #define CONFIG_HAS_ETH0
546   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
547 544 #define CONFIG_HAS_ETH1
548   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
549 545 #define CONFIG_HAS_ETH2
550   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
551 546 #define CONFIG_HAS_ETH3
552   -#define CONFIG_ETH3ADDR 00:E0:0C:00:03:FD
553 547 #endif
554 548  
555 549 #define CONFIG_IPADDR 192.168.1.253
include/configs/MPC8555CDS.h
Diff comments   View file @ 92ac520
... ... @@ -412,15 +412,10 @@
412 412 /*
413 413 * Environment Configuration
414 414 */
415   -
416   -/* The mac addresses for all ethernet interface */
417 415 #if defined(CONFIG_TSEC_ENET)
418 416 #define CONFIG_HAS_ETH0
419   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
420 417 #define CONFIG_HAS_ETH1
421   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
422 418 #define CONFIG_HAS_ETH2
423   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
424 419 #endif
425 420  
426 421 #define CONFIG_IPADDR 192.168.1.253
include/configs/MPC8560ADS.h
Diff comments   View file @ 92ac520
... ... @@ -12,7 +12,7 @@
12 12 * Please refer to doc/README.mpc85xx for more info.
13 13 *
14 14 * Make sure you change the MAC address and other network params first,
15   - * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
  15 + * search for CONFIG_SERVERIP, etc. in this file.
16 16 */
17 17  
18 18 #ifndef __CONFIG_H
19 19  
20 20  
21 21  
22 22  
... ... @@ -443,17 +443,11 @@
443 443 /*
444 444 * Environment Configuration
445 445 */
446   -
447   -/* The mac addresses for all ethernet interface */
448 446 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
449 447 #define CONFIG_HAS_ETH0
450   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
451 448 #define CONFIG_HAS_ETH1
452   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
453 449 #define CONFIG_HAS_ETH2
454   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
455 450 #define CONFIG_HAS_ETH3
456   -#define CONFIG_ETH3ADDR 00:E0:0C:00:03:FD
457 451 #endif
458 452  
459 453 #define CONFIG_IPADDR 192.168.1.253
include/configs/MPC8568MDS.h
Diff comments   View file @ 92ac520
... ... @@ -438,13 +438,9 @@
438 438 /* The mac addresses for all ethernet interface */
439 439 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_UEC_ETH)
440 440 #define CONFIG_HAS_ETH0
441   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
442 441 #define CONFIG_HAS_ETH1
443   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
444 442 #define CONFIG_HAS_ETH2
445   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
446 443 #define CONFIG_HAS_ETH3
447   -#define CONFIG_ETH3ADDR 00:E0:0C:00:03:FD
448 444 #endif
449 445  
450 446 #define CONFIG_IPADDR 192.168.1.253
include/configs/MPC8572DS.h
Diff comments   View file @ 92ac520
... ... @@ -658,17 +658,11 @@
658 658 /*
659 659 * Environment Configuration
660 660 */
661   -
662   -/* The mac addresses for all ethernet interface */
663 661 #if defined(CONFIG_TSEC_ENET)
664 662 #define CONFIG_HAS_ETH0
665   -#define CONFIG_ETHADDR 00:E0:0C:02:00:FD
666 663 #define CONFIG_HAS_ETH1
667   -#define CONFIG_ETH1ADDR 00:E0:0C:02:01:FD
668 664 #define CONFIG_HAS_ETH2
669   -#define CONFIG_ETH2ADDR 00:E0:0C:02:02:FD
670 665 #define CONFIG_HAS_ETH3
671   -#define CONFIG_ETH3ADDR 00:E0:0C:02:03:FD
672 666 #endif
673 667  
674 668 #define CONFIG_IPADDR 192.168.1.254
include/configs/MPC8610HPCD.h
Diff comments   View file @ 92ac520
... ... @@ -300,7 +300,6 @@
300 300  
301 301 #define CONFIG_ULI526X
302 302 #ifdef CONFIG_ULI526X
303   -#define CONFIG_ETHADDR 00:E0:0C:00:00:01
304 303 #endif
305 304  
306 305 /************************************************************
include/configs/MPC8641HPCN.h
Diff comments   View file @ 92ac520
... ... @@ -10,7 +10,7 @@
10 10 * MPC8641HPCN board configuration file
11 11 *
12 12 * Make sure you change the MAC address and other network params first,
13   - * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
  13 + * search for CONFIG_SERVERIP, etc. in this file.
14 14 */
15 15  
16 16 #ifndef __CONFIG_H
... ... @@ -678,14 +678,6 @@
678 678 /*
679 679 * Environment Configuration
680 680 */
681   -
682   -/* The mac addresses for all ethernet interface */
683   -#if defined(CONFIG_TSEC_ENET)
684   -#define CONFIG_ETHADDR 00:E0:0C:00:00:01
685   -#define CONFIG_ETH1ADDR 00:E0:0C:00:01:FD
686   -#define CONFIG_ETH2ADDR 00:E0:0C:00:02:FD
687   -#define CONFIG_ETH3ADDR 00:E0:0C:00:03:FD
688   -#endif
689 681  
690 682 #define CONFIG_HAS_ETH0 1
691 683 #define CONFIG_HAS_ETH1 1
include/configs/a4m072.h
Diff comments   View file @ 92ac520
... ... @@ -165,7 +165,6 @@
165 165 "setenv bootargs ${bootargs} no_ethaddr;" \
166 166 "fi\0" \
167 167 "hostname=CPUP0\0" \
168   - "ethaddr=00:00:00:00:00:00\0" \
169 168 "netdev=eth0\0" \
170 169 "bootcmd=run bootcmd_nor\0" \
171 170 ""
include/configs/bct-brettl2.h
Diff comments   View file @ 92ac520
... ... @@ -73,8 +73,6 @@
73 73 #define CONFIG_GATEWAYIP 192.168.233.1
74 74 #define CONFIG_SERVERIP 192.168.233.53
75 75 #define CONFIG_ROOTPATH "/romfs/brettl2"
76   -/* Uncomment next line to use fixed MAC address */
77   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
78 76 #define CONFIG_LIB_RAND
79 77 #endif
80 78  
include/configs/bf518f-ezbrd.h
Diff comments   View file @ 92ac520
... ... @@ -87,8 +87,6 @@
87 87 #endif
88 88 #define CONFIG_HOSTNAME bf518f-ezbrd
89 89 #define CONFIG_PHY_ADDR 3
90   -/* Uncomment next line to use fixed MAC address */
91   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
92 90 #define CONFIG_LIB_RAND
93 91  
94 92 /*
include/configs/bf526-ezbrd.h
Diff comments   View file @ 92ac520
... ... @@ -85,8 +85,6 @@
85 85 #define CONFIG_NETCONSOLE 1
86 86 #endif
87 87 #define CONFIG_HOSTNAME bf526-ezbrd
88   -/* Uncomment next line to use fixed MAC address */
89   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
90 88 #define CONFIG_LIB_RAND
91 89  
92 90 /*
include/configs/bf527-ezkit.h
Diff comments   View file @ 92ac520
... ... @@ -83,8 +83,6 @@
83 83 #define CONFIG_NETCONSOLE 1
84 84 #endif
85 85 #define CONFIG_HOSTNAME bf527-ezkit
86   -/* Uncomment next line to use fixed MAC address */
87   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
88 86 #define CONFIG_LIB_RAND
89 87  
90 88 /*
include/configs/bf533-ezkit.h
Diff comments   View file @ 92ac520
... ... @@ -75,8 +75,6 @@
75 75 SSYNC(); \
76 76 } while (0)
77 77 #define CONFIG_HOSTNAME bf533-ezkit
78   -/* Uncomment next line to use fixed MAC address */
79   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
80 78  
81 79  
82 80 /*
include/configs/bf533-stamp.h
Diff comments   View file @ 92ac520
... ... @@ -68,8 +68,6 @@
68 68 SSYNC(); \
69 69 } while (0)
70 70 #define CONFIG_HOSTNAME bf533-stamp
71   -/* Uncomment next line to use fixed MAC address */
72   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:b8 */
73 71  
74 72  
75 73 /* I2C */
include/configs/bf537-minotaur.h
Diff comments   View file @ 92ac520
... ... @@ -86,8 +86,6 @@
86 86  
87 87 #define CONFIG_SYS_AUTOLOAD "no"
88 88 #define CONFIG_ROOTPATH "/romfs"
89   -/* Uncomment next line to use fixed MAC address */
90   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
91 89  
92 90 #define CONFIG_LIB_RAND
93 91  
include/configs/bf537-pnav.h
Diff comments   View file @ 92ac520
... ... @@ -65,8 +65,6 @@
65 65 #define CONFIG_RMII
66 66 #endif
67 67 #define CONFIG_HOSTNAME bf537-pnav
68   -/* Uncomment next line to use fixed MAC address */
69   -/* #define CONFIG_ETHADDR 02:80:ad:24:21:18 */
70 68 #define CONFIG_LIB_RAND
71 69  
72 70 /*
include/configs/bf537-srv1.h
Diff comments   View file @ 92ac520
... ... @@ -86,8 +86,6 @@
86 86  
87 87 #define CONFIG_SYS_AUTOLOAD "no"
88 88 #define CONFIG_ROOTPATH "/romfs"
89   -/* Uncomment next line to use fixed MAC address */
90   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
91 89 #define CONFIG_LIB_RAND
92 90  
93 91 /*
include/configs/bf537-stamp.h
Diff comments   View file @ 92ac520
... ... @@ -65,8 +65,6 @@
65 65 #define CONFIG_NETCONSOLE 1
66 66 #endif
67 67 #define CONFIG_HOSTNAME bf537-stamp
68   -/* Uncomment next line to use fixed MAC address */
69   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
70 68 #define CONFIG_LIB_RAND
71 69  
72 70 /*
include/configs/bf538f-ezkit.h
Diff comments   View file @ 92ac520
... ... @@ -63,8 +63,6 @@
63 63 #define CONFIG_SMC91111 1
64 64 #define CONFIG_SMC91111_BASE 0x20310300
65 65 #define CONFIG_HOSTNAME bf538f-ezkit
66   -/* Uncomment next line to use fixed MAC address */
67   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
68 66  
69 67  
70 68 /*
include/configs/bf548-ezkit.h
Diff comments   View file @ 92ac520
... ... @@ -73,8 +73,6 @@
73 73 #define CONFIG_SMC911X_BASE 0x24000000
74 74 #define CONFIG_SMC911X_16_BIT
75 75 #define CONFIG_HOSTNAME bf548-ezkit
76   -/* Uncomment next line to use fixed MAC address */
77   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
78 76  
79 77  
80 78 /*
include/configs/bf561-acvilon.h
Diff comments   View file @ 92ac520
... ... @@ -92,9 +92,6 @@
92 92  
93 93 #define CONFIG_HOSTNAME bf561-acvilon
94 94  
95   -/* Uncomment next line to use fixed MAC address */
96   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
97   -
98 95  
99 96 /*
100 97 * Flash Settings
include/configs/bf561-ezkit.h
Diff comments   View file @ 92ac520
... ... @@ -64,8 +64,6 @@
64 64 #define CONFIG_SMC91111_BASE 0x2C010300
65 65 #define CONFIG_SMC_USE_32_BIT 1
66 66 #define CONFIG_HOSTNAME bf561-ezkit
67   -/* Uncomment next line to use fixed MAC address */
68   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
69 67  
70 68  
71 69 /*
include/configs/blackstamp.h
Diff comments   View file @ 92ac520
... ... @@ -76,9 +76,6 @@
76 76 #define CONFIG_HOSTNAME blackstamp
77 77 #define CONFIG_ROOTPATH "/checkout/uClinux-dist/romfs"
78 78 #define CONFIG_SYS_AUTOLOAD "no"
79   -
80   -/* To remove hardcoding and enable MAC storage in EEPROM */
81   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:b8 */
82 79 #endif
83 80  
84 81 #define CONFIG_ENV_IS_IN_SPI_FLASH
include/configs/blackvme.h
Diff comments   View file @ 92ac520
... ... @@ -85,9 +85,6 @@
85 85 #define CFG_AUTOLOAD "no"
86 86 #define CONFIG_CMD_DHCP
87 87 #define CONFIG_CMD_PING
88   -#define CONFIG_ENV_OVERWRITE 1 /* enable changing MAC at runtime */
89   -/* Comment out hardcoded MAC to enable MAC storage in EEPROM */
90   -/* # define CONFIG_ETHADDR ff:ee:dd:cc:bb:aa */
91 88  
92 89 /*
93 90 * SDRAM settings & memory map
include/configs/br4.h
Diff comments   View file @ 92ac520
... ... @@ -69,9 +69,6 @@
69 69 #endif
70 70 #define CONFIG_HOSTNAME br4
71 71 #define CONFIG_TFTP_BLOCKSIZE 4404
72   -/* Uncomment next line to use fixed MAC address */
73   -/* #define CONFIG_ETHADDR 5c:38:1a:80:a7:00 */
74   -
75 72  
76 73 /*
77 74 * Flash Settings
include/configs/cm-bf527.h
Diff comments   View file @ 92ac520
... ... @@ -83,8 +83,6 @@
83 83 #define CONFIG_NETCONSOLE 1
84 84 #endif
85 85 #define CONFIG_HOSTNAME cm-bf527
86   -/* Uncomment next line to use fixed MAC address */
87   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
88 86 #define CONFIG_LIB_RAND
89 87  
90 88 /*
include/configs/cm-bf533.h
Diff comments   View file @ 92ac520
... ... @@ -66,8 +66,6 @@
66 66 #define CONFIG_SMC91111 1
67 67 #define CONFIG_SMC91111_BASE 0x20200300
68 68 #define CONFIG_HOSTNAME cm-bf533
69   -/* Uncomment next line to use fixed MAC address */
70   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
71 69  
72 70  
73 71 /*
include/configs/cm-bf537e.h
Diff comments   View file @ 92ac520
... ... @@ -71,8 +71,6 @@
71 71 #define CONFIG_NETCONSOLE 1
72 72 #endif
73 73 #define CONFIG_HOSTNAME cm-bf537e
74   -/* Uncomment next line to use fixed MAC address */
75   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
76 74 #define CONFIG_LIB_RAND
77 75  
78 76 /*
include/configs/cm-bf537u.h
Diff comments   View file @ 92ac520
... ... @@ -69,8 +69,6 @@
69 69 #define CONFIG_NETCONSOLE 1
70 70 #endif
71 71 #define CONFIG_HOSTNAME cm-bf537u
72   -/* Uncomment next line to use fixed MAC address */
73   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
74 72 #define CONFIG_LIB_RAND
75 73  
76 74 /*
include/configs/cm-bf548.h
Diff comments   View file @ 92ac520
... ... @@ -76,8 +76,6 @@
76 76 #define CONFIG_SMC911X_BASE 0x24000000
77 77 #define CONFIG_SMC911X_16_BIT
78 78 #define CONFIG_HOSTNAME cm-bf548
79   -/* Uncomment next line to use fixed MAC address */
80   -/* #define CONFIG_ETHADDR 02:80:ad:24:31:91 */
81 79  
82 80  
83 81 /*
include/configs/cm-bf561.h
Diff comments   View file @ 92ac520
... ... @@ -67,8 +67,6 @@
67 67 #define CONFIG_SMC911X_BASE 0x24008000 /* AMS1 */
68 68 #define CONFIG_SMC911X_16_BIT
69 69 #define CONFIG_HOSTNAME cm-bf561
70   -/* Uncomment next line to use fixed MAC address */
71   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:cf */
72 70  
73 71  
74 72 /*
include/configs/cobra5272.h
Diff comments   View file @ 92ac520
... ... @@ -177,7 +177,6 @@
177 177  
178 178 /* User network settings */
179 179  
180   -#define CONFIG_ETHADDR 00:00:00:00:00:09 /* default ethernet MAC addr. */
181 180 #define CONFIG_IPADDR 192.168.100.2 /* default board IP address */
182 181 #define CONFIG_SERVERIP 192.168.100.1 /* default tftp server IP address */
183 182  
include/configs/dbau1x00.h
Diff comments   View file @ 92ac520
... ... @@ -37,8 +37,6 @@
37 37 #endif
38 38 #endif
39 39  
40   -#define CONFIG_ETHADDR DE:AD:BE:EF:01:01 /* Ethernet address */
41   -
42 40 #define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
43 41  
44 42 #define CONFIG_BAUDRATE 115200
include/configs/ea20.h
Diff comments   View file @ 92ac520
... ... @@ -242,7 +242,6 @@
242 242 "rootpath=/opt/eldk/arm\0" \
243 243 "splashpos=230,180\0" \
244 244 "testrfspath=/opt/eldk/test_arm\0" \
245   - "tempmac=setenv ethaddr 02:ea:20:ff:ff:ff\0" \
246 245 "nandargs=setenv bootargs rootfstype=ubifs ro chk_data_crc " \
247 246 "ubi.mtd=${as} root=ubi0:rootfs\0" \
248 247 "nandrwargs=setenv bootargs rootfstype=ubifs rw chk_data_crc " \
... ... @@ -315,7 +314,7 @@
315 314 "fi;" \
316 315 "else echo U-Boot not downloaded..exiting;fi\0" \
317 316 "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0" \
318   - "bootcmd=run tempmac;run net_testrfsnet_testrfs\0""
  317 + "bootcmd=run net_testrfsnet_testrfs\0""
319 318  
320 319 #endif /* __CONFIG_H */
include/configs/gr_cpci_ax2000.h
Diff comments   View file @ 92ac520
... ... @@ -280,7 +280,6 @@
280 280 /*#define CONFIG_SHOW_ACTIVITY*/
281 281 #define CONFIG_NET_RETRY_COUNT 10 /* # of retries */
282 282  
283   -#define CONFIG_ETHADDR 00:00:7a:cc:00:13
284 283 #define CONFIG_PHY_ADDR 0x00
285 284  
286 285 /*
include/configs/gr_ep2s60.h
Diff comments   View file @ 92ac520
... ... @@ -260,16 +260,6 @@
260 260 /* USE GRETH Ethernet Driver */
261 261 #define CONFIG_GRETH 1
262 262  
263   -/* Default GRETH Ethernet HARDWARE address */
264   -#define GRETH_HWADDR_0 0x00
265   -#define GRETH_HWADDR_1 0x00
266   -#define GRETH_HWADDR_2 0x7a
267   -#define GRETH_HWADDR_3 0xcc
268   -#define GRETH_HWADDR_4 0x00
269   -#define GRETH_HWADDR_5 0x13
270   -#endif
271   -
272   -#define CONFIG_ETHADDR 00:00:7a:cc:00:13
273 263 #define CONFIG_PHY_ADDR 0x00
274 264  
275 265 /*
include/configs/gr_xc3s_1500.h
Diff comments   View file @ 92ac520
... ... @@ -220,15 +220,6 @@
220 220 */
221 221 #define CONFIG_GRETH 1
222 222  
223   -/* Default GRETH Ethernet HARDWARE address */
224   -#define GRETH_HWADDR_0 0x00
225   -#define GRETH_HWADDR_1 0x00
226   -#define GRETH_HWADDR_2 0x7a
227   -#define GRETH_HWADDR_3 0xcc
228   -#define GRETH_HWADDR_4 0x00
229   -#define GRETH_HWADDR_5 0x12
230   -
231   -#define CONFIG_ETHADDR 00:00:7a:cc:00:12
232 223 #define CONFIG_PHY_ADDR 0x00
233 224  
234 225 /*
include/configs/grsim.h
Diff comments   View file @ 92ac520
... ... @@ -94,7 +94,6 @@
94 94 "rootpath=/export/roofs\0" \
95 95 "scratch=40000000\0" \
96 96 "getkernel=tftpboot $(scratch) $(bootfile)\0" \
97   - "ethaddr=00:00:7A:CC:00:12\0" \
98 97 "bootargs=console=ttyS0,38400" \
99 98 ""
100 99 #define CONFIG_NETMASK 255.255.255.0
... ... @@ -242,16 +241,6 @@
242 241 * Ethernet configuration
243 242 */
244 243 #define CONFIG_GRETH 1
245   -
246   -/* Default HARDWARE address */
247   -#define GRETH_HWADDR_0 0x00
248   -#define GRETH_HWADDR_1 0x00
249   -#define GRETH_HWADDR_2 0x7A
250   -#define GRETH_HWADDR_3 0xcc
251   -#define GRETH_HWADDR_4 0x00
252   -#define GRETH_HWADDR_5 0x12
253   -
254   -#define CONFIG_ETHADDR 00:00:7a:cc:00:12
255 244  
256 245 /*
257 246 * Define CONFIG_GRETH_10MBIT to force GRETH at 10Mb/s
include/configs/grsim_leon2.h
Diff comments   View file @ 92ac520
... ... @@ -91,7 +91,6 @@
91 91 "rootpath=/export/roofs\0" \
92 92 "scratch=40000000\0" \
93 93 "getkernel=tftpboot $(scratch) $(bootfile)\0" \
94   - "ethaddr=00:00:7A:CC:00:12\0" \
95 94 "bootargs=console=ttyS0,38400" \
96 95 ""
97 96 #define CONFIG_NETMASK 255.255.255.0
... ... @@ -240,16 +239,6 @@
240 239 * Ethernet configuration
241 240 */
242 241 /*#define CONFIG_GRETH 1*/
243   -
244   -/* Default HARDWARE address */
245   -#define GRETH_HWADDR_0 0x00
246   -#define GRETH_HWADDR_1 0x00
247   -#define GRETH_HWADDR_2 0x7A
248   -#define GRETH_HWADDR_3 0xcc
249   -#define GRETH_HWADDR_4 0x00
250   -#define GRETH_HWADDR_5 0x12
251   -
252   -#define CONFIG_ETHADDR 00:00:7a:cc:00:12
253 242  
254 243 /*
255 244 * Define CONFIG_GRETH_10MBIT to force GRETH at 10Mb/s
include/configs/ibf-dsp561.h
Diff comments   View file @ 92ac520
... ... @@ -64,8 +64,6 @@
64 64 #define CONFIG_DRIVER_AX88180 1
65 65 #define AX88180_BASE 0x2c000000
66 66 #define CONFIG_HOSTNAME ibf-dsp561
67   -/* Uncomment next line to use fixed MAC address */
68   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
69 67  
70 68  
71 69 /*
include/configs/inka4x0.h
Diff comments   View file @ 92ac520
... ... @@ -110,9 +110,6 @@
110 110  
111 111 #undef CONFIG_BOOTARGS
112 112  
113   -#define CONFIG_ETHADDR 00:a0:a4:03:00:00
114   -#define CONFIG_OVERWRITE_ETHADDR_ONCE
115   -
116 113 #define CONFIG_IPADDR 192.168.100.2
117 114 #define CONFIG_SERVERIP 192.168.100.1
118 115 #define CONFIG_NETMASK 255.255.255.0
include/configs/microblaze-generic.h
Diff comments   View file @ 92ac520
... ... @@ -350,7 +350,6 @@
350 350 #define CONFIG_IPADDR 192.168.0.3
351 351 #define CONFIG_SERVERIP 192.168.0.5
352 352 #define CONFIG_GATEWAYIP 192.168.0.1
353   -#define CONFIG_ETHADDR 00:E0:0C:00:00:FD
354 353  
355 354 /* architecture dependent code */
356 355 #define CONFIG_SYS_USR_EXCEP /* user exception */
include/configs/motionpro.h
Diff comments   View file @ 92ac520
... ... @@ -85,8 +85,6 @@
85 85 #define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */
86 86 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
87 87  
88   -#define CONFIG_ETHADDR 00:50:C2:40:10:00
89   -#define CONFIG_OVERWRITE_ETHADDR_ONCE 1
90 88 #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
91 89  
92 90 /*
include/configs/omap3_cairo.h
Diff comments   View file @ 92ac520
... ... @@ -90,7 +90,6 @@
90 90 "machid=ffffffff\0" \
91 91 "fdt_high=0x87000000\0" \
92 92 "baudrate=115200\0" \
93   - "ethaddr=00:50:C2:7E:90:F0\0" \
94 93 "fec_addr=00:50:C2:7E:90:F0\0" \
95 94 "netmask=255.255.255.0\0" \
96 95 "ipaddr=192.168.2.9\0" \
include/configs/pb1x00.h
Diff comments   View file @ 92ac520
... ... @@ -31,8 +31,6 @@
31 31 #endif
32 32 #endif
33 33  
34   -#define CONFIG_ETHADDR DE:AD:BE:EF:01:01 /* Ethernet address */
35   -
36 34 #define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
37 35  
38 36 #define CONFIG_BAUDRATE 115200
include/configs/pr1.h
Diff comments   View file @ 92ac520
... ... @@ -69,8 +69,6 @@
69 69 #endif
70 70 #define CONFIG_HOSTNAME pr1
71 71 #define CONFIG_TFTP_BLOCKSIZE 4404
72   -/* Uncomment next line to use fixed MAC address */
73   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
74 72  
75 73  
76 74 /*
include/configs/sbc405.h
Diff comments   View file @ 92ac520
... ... @@ -102,7 +102,6 @@
102 102  
103 103 #define CONFIG_SDRAM_BANK0 1 /* init onboard SDRAM bank 0 */
104 104  
105   -#define CONFIG_ETHADDR DE:AD:BE:EF:01:01 /* Ethernet address */
106 105 #define CONFIG_IPADDR 192.168.193.102
107 106 #define CONFIG_NETMASK 255.255.255.224
108 107 #define CONFIG_SERVERIP 192.168.193.119
include/configs/sbc8548.h
Diff comments   View file @ 92ac520
... ... @@ -581,13 +581,9 @@
581 581 /*
582 582 * Environment Configuration
583 583 */
584   -
585   -/* The mac addresses for all ethernet interface */
586 584 #if defined(CONFIG_TSEC_ENET)
587 585 #define CONFIG_HAS_ETH0
588   -#define CONFIG_ETHADDR 02:E0:0C:00:00:FD
589 586 #define CONFIG_HAS_ETH1
590   -#define CONFIG_ETH1ADDR 02:E0:0C:00:01:FD
591 587 #endif
592 588  
593 589 #define CONFIG_IPADDR 192.168.0.55
include/configs/sbc8641d.h
Diff comments   View file @ 92ac520
... ... @@ -14,7 +14,7 @@
14 14 * SBC8641D board configuration file
15 15 *
16 16 * Make sure you change the MAC address and other network params first,
17   - * search for CONFIG_ETHADDR, CONFIG_SERVERIP, etc in this file.
  17 + * search for CONFIG_SERVERIP, etc in this file.
18 18 */
19 19  
20 20 #ifndef __CONFIG_H
... ... @@ -527,14 +527,6 @@
527 527 /*
528 528 * Environment Configuration
529 529 */
530   -
531   -/* The mac addresses for all ethernet interface */
532   -#if defined(CONFIG_TSEC_ENET)
533   -#define CONFIG_ETHADDR 02:E0:0C:00:00:01
534   -#define CONFIG_ETH1ADDR 02:E0:0C:00:01:FD
535   -#define CONFIG_ETH2ADDR 02:E0:0C:00:02:FD
536   -#define CONFIG_ETH3ADDR 02:E0:0C:00:03:FD
537   -#endif
538 530  
539 531 #define CONFIG_HAS_ETH0 1
540 532 #define CONFIG_HAS_ETH1 1
include/configs/scb9328.h
Diff comments   View file @ 92ac520
... ... @@ -50,7 +50,6 @@
50 50 #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"
51 51 #define CONFIG_BOOTCOMMAND "bootm 10040000"
52 52 #define CONFIG_SHOW_BOOT_PROGRESS
53   -#define CONFIG_ETHADDR 80:81:82:83:84:85
54 53 #define CONFIG_NETMASK 255.255.255.0
55 54 #define CONFIG_IPADDR 10.10.10.9
56 55 #define CONFIG_SERVERIP 10.10.10.10
include/configs/sequoia.h
Diff comments   View file @ 92ac520
... ... @@ -100,15 +100,6 @@
100 100 #if defined(CONFIG_SYS_RAMBOOT)
101 101 #define CONFIG_ENV_IS_NOWHERE /* Store env in memory only */
102 102 #define CONFIG_ENV_SIZE (8 << 10)
103   -/*
104   - * In RAM-booting version, we have no environment storage. So we need to
105   - * provide at least preliminary MAC addresses for the 4xx EMAC driver to
106   - * register the interfaces. Those two addresses are generated via the
107   - * tools/gen_eth_addr tool and should only be used in a closed laboratory
108   - * environment.
109   - */
110   -#define CONFIG_ETHADDR 4a:56:49:22:3e:43
111   -#define CONFIG_ETH1ADDR 02:93:53:d5:06:98
112 103 #else
113 104 #define CONFIG_ENV_IS_IN_FLASH /* use FLASH for environ vars */
114 105 #endif
include/configs/stxgp3.h
Diff comments   View file @ 92ac520
... ... @@ -13,7 +13,7 @@
13 13 /* mpc8560ads board configuration file */
14 14 /* please refer to doc/README.mpc85xx for more info */
15 15 /* make sure you change the MAC address and other network params first,
16   - * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
  16 + * search for CONFIG_SERVERIP, etc. in this file
17 17 */
18 18  
19 19 #ifndef __CONFIG_H
20 20  
21 21  
22 22  
... ... @@ -342,14 +342,10 @@
342 342 #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
343 343 #endif
344 344  
345   -/*Note: change below for your network setting!!! */
346 345 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
347 346 #define CONFIG_HAS_ETH0
348   -#define CONFIG_ETHADDR 00:e0:0c:07:9b:8a
349 347 #define CONFIG_HAS_ETH1
350   -#define CONFIG_ETH1ADDR 00:e0:0c:07:9b:8b
351 348 #define CONFIG_HAS_ETH2
352   -#define CONFIG_ETH2ADDR 00:e0:0c:07:9b:8c
353 349 #endif
354 350  
355 351 #define CONFIG_SERVERIP 192.168.85.1
include/configs/stxssa.h
Diff comments   View file @ 92ac520
... ... @@ -13,7 +13,7 @@
13 13 /* mpc8560ads board configuration file */
14 14 /* please refer to doc/README.mpc85xx for more info */
15 15 /* make sure you change the MAC address and other network params first,
16   - * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
  16 + * search for CONFIG_SERVERIP, etc. in this file
17 17 */
18 18  
19 19 #ifndef __CONFIG_H
20 20  
21 21  
22 22  
... ... @@ -377,14 +377,10 @@
377 377 #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */
378 378 #endif
379 379  
380   -/*Note: change below for your network setting!!! */
381 380 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
382 381 #define CONFIG_HAS_ETH0
383   -#define CONFIG_ETHADDR 00:e0:0c:07:9b:8a
384 382 #define CONFIG_HAS_ETH1
385   -#define CONFIG_ETH1ADDR 00:e0:0c:07:9b:8b
386 383 #define CONFIG_HAS_ETH2
387   -#define CONFIG_ETH2ADDR 00:e0:0c:07:9b:8c
388 384 #endif
389 385  
390 386 /*
include/configs/tcm-bf518.h
Diff comments   View file @ 92ac520
... ... @@ -66,8 +66,6 @@
66 66 #define CONFIG_NETCONSOLE 1
67 67 #endif
68 68 #define CONFIG_HOSTNAME tcm-bf518
69   -/* Uncomment next line to use fixed MAC address */
70   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
71 69 #define CONFIG_LIB_RAND
72 70  
73 71 /*
include/configs/tcm-bf537.h
Diff comments   View file @ 92ac520
... ... @@ -71,8 +71,6 @@
71 71 #define CONFIG_NETCONSOLE 1
72 72 #endif
73 73 #define CONFIG_HOSTNAME tcm-bf537
74   -/* Uncomment next line to use fixed MAC address */
75   -/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
76 74 #define CONFIG_LIB_RAND
77 75  
78 76 /*
include/configs/uniphier.h
Diff comments   View file @ 92ac520
... ... @@ -209,7 +209,6 @@
209 209 /*
210 210 * Network Configuration
211 211 */
212   -#define CONFIG_ETHADDR 00:21:83:24:00:00
213 212 #define CONFIG_SERVERIP 192.168.11.1
214 213 #define CONFIG_IPADDR 192.168.11.10
215 214 #define CONFIG_GATEWAYIP 192.168.11.1
include/configs/v38b.h
Diff comments   View file @ 92ac520
... ... @@ -148,7 +148,6 @@
148 148 "netmask=255.255.0.0\0" \
149 149 "ipaddr=192.168.160.18\0" \
150 150 "serverip=192.168.1.1\0" \
151   - "ethaddr=00:e0:ee:00:05:2e\0" \
152 151 "bootfile=/tftpboot/v38b/uImage\0" \
153 152 "u-boot=/tftpboot/v38b/u-boot.bin\0" \
154 153 ""
include/configs/work_92105.h
Diff comments   View file @ 92ac520
... ... @@ -177,17 +177,6 @@
177 177 #define CONFIG_ENV_ADDR 0x80000100
178 178  
179 179 /*
180   - * Provide default ethernet address
181   - *
182   - * THIS IS NORMALLY NOT DONE. HERE WE KEEP WHAT WAS IN THE PORTED
183   - * BOARD CONFIG IN CASE SOME PROVISIONING PROCESS OUT THERE EXPECTS
184   - * THIS MAC ADDRESS WHEN THE DEVICE HAS STILL ITS DEFAULT CONFIG.
185   - */
186   -
187   -#define CONFIG_ETHADDR 00:12:B4:00:AF:FE
188   -#define CONFIG_OVERWRITE_ETHADDR_ONCE
189   -
190   -/*
191 180 * U-Boot Commands
192 181 */
193 182 #include <config_cmd_default.h>
include/configs/xaeniax.h
Diff comments   View file @ 92ac520
... ... @@ -70,7 +70,6 @@
70 70 #undef CONFIG_CMD_DTT
71 71  
72 72  
73   -#define CONFIG_ETHADDR 08:00:3e:26:0a:5b
74 73 #define CONFIG_NETMASK 255.255.255.0
75 74 #define CONFIG_IPADDR 192.168.68.201
76 75 #define CONFIG_SERVERIP 192.168.68.62
include/configs/zeus.h
Diff comments   View file @ 92ac520
... ... @@ -296,8 +296,6 @@
296 296 #define CONFIG_IPADDR 192.168.1.10
297 297 #define CONFIG_SERVERIP 192.168.1.100
298 298 #define CONFIG_GATEWAYIP 192.168.1.100
299   -#define CONFIG_ETHADDR 50:00:00:00:06:00
300   -#define CONFIG_ETH1ADDR 50:00:00:00:06:01
301 299 #if 0
302 300 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
303 301 #else
include/env_default.h
Diff comments   View file @ 92ac520
... ... @@ -49,24 +49,6 @@
49 49 #ifdef CONFIG_LOADS_ECHO
50 50 "loads_echo=" __stringify(CONFIG_LOADS_ECHO) "\0"
51 51 #endif
52   -#ifdef CONFIG_ETHADDR
53   - "ethaddr=" __stringify(CONFIG_ETHADDR) "\0"
54   -#endif
55   -#ifdef CONFIG_ETH1ADDR
56   - "eth1addr=" __stringify(CONFIG_ETH1ADDR) "\0"
57   -#endif
58   -#ifdef CONFIG_ETH2ADDR
59   - "eth2addr=" __stringify(CONFIG_ETH2ADDR) "\0"
60   -#endif
61   -#ifdef CONFIG_ETH3ADDR
62   - "eth3addr=" __stringify(CONFIG_ETH3ADDR) "\0"
63   -#endif
64   -#ifdef CONFIG_ETH4ADDR
65   - "eth4addr=" __stringify(CONFIG_ETH4ADDR) "\0"
66   -#endif
67   -#ifdef CONFIG_ETH5ADDR
68   - "eth5addr=" __stringify(CONFIG_ETH5ADDR) "\0"
69   -#endif
70 52 #ifdef CONFIG_ETHPRIME
71 53 "ethprime=" CONFIG_ETHPRIME "\0"
72 54 #endif