mpc83xx: remove hardcoded network addresses from config files

and avoid e.g., two identical boards from causing random networking
conflicts when hooked up to the same network.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 0a4ba29..1478ec8 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -580,13 +580,6 @@
  */
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_ETHADDR         00:E0:0C:00:95:01
-#define CONFIG_ETH1ADDR                00:E0:0C:00:95:02
-
-#define CONFIG_IPADDR          10.0.0.2
-#define CONFIG_SERVERIP                10.0.0.1
-#define CONFIG_GATEWAYIP       10.0.0.1
-#define CONFIG_NETMASK         255.0.0.0
 #define CONFIG_NETDEV          eth1
 
 #define CONFIG_HOSTNAME                mpc8313erdb

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index cfed4ca..a8570ce 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -616,9 +616,7 @@
 
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR         04:00:00:00:00:0A
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR                04:00:00:00:00:0B
 #endif
 
 #define CONFIG_BAUDRATE 115200

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 8e6f7ce..4046f80 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -525,17 +525,11 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_HAS_ETH0                                /* add support for "ethaddr" */
-#define CONFIG_ETHADDR 00:04:9f:ef:03:01
 #define CONFIG_HAS_ETH1                                /* add support for "eth1addr" */
-#define CONFIG_ETH1ADDR        00:04:9f:ef:03:02
 
 /* use mac_read_from_eeprom() to read ethaddr from I2C EEPROM (see CONFIG_SYS_I2C_EEPROM) */
 #define CONFIG_SYS_I2C_MAC_OFFSET      0x7f00  /* MAC address offset in I2C EEPROM */
 
-#define CONFIG_IPADDR          10.0.0.2
-#define CONFIG_SERVERIP                10.0.0.1
-#define CONFIG_GATEWAYIP       10.0.0.1
-#define CONFIG_NETMASK         255.0.0.0
 #define CONFIG_NETDEV          eth1
 
 #define CONFIG_HOSTNAME                mpc8323erdb

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 1adac64..2ad5f60 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -544,9 +544,7 @@
 
 #if defined(CONFIG_UEC_ETH)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR 00:04:9f:ef:03:01
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR        00:04:9f:ef:03:02
 #endif
 
 #define CONFIG_BAUDRATE        115200

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 6361c45..bf28d9e 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -685,22 +685,14 @@
 #define CONFIG_ENV_OVERWRITE
 
 #if defined(CONFIG_TSEC_ENET)
-#define CONFIG_ETHADDR         00:04:9f:ef:23:33
 #define CONFIG_HAS_ETH1
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETH1ADDR                00:E0:0C:00:7E:21
 #endif
 
-#define CONFIG_IPADDR          192.168.1.253
-
 #define CONFIG_HOSTNAME                mpc8349emds
 #define CONFIG_ROOTPATH                /nfsroot/rootfs
 #define CONFIG_BOOTFILE                uImage
 
-#define CONFIG_SERVERIP                192.168.1.1
-#define CONFIG_GATEWAYIP       192.168.1.1
-#define CONFIG_NETMASK         255.255.255.0
-
 #define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index eaa59fd..52e2851 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -678,18 +678,6 @@ boards, we say we have two, but don't display a message if we find only one. */
  */
 #define CONFIG_ENV_OVERWRITE
 
-#ifdef CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR         00:E0:0C:00:8C:01
-#endif
-
-#ifdef CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR                00:E0:0C:00:8C:02
-#endif
-
-#define CONFIG_IPADDR          192.168.1.253
-#define CONFIG_SERVERIP                192.168.1.1
-#define CONFIG_GATEWAYIP       192.168.1.1
-#define CONFIG_NETMASK         255.255.252.0
 #define CONFIG_NETDEV          eth0
 
 #ifdef CONFIG_MPC8349ITX

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 6fa7287..b9b5eab 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -587,9 +587,7 @@
 
 #if defined(CONFIG_UEC_ETH)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR 00:04:9f:ef:01:01
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR 00:04:9f:ef:01:02
 #endif
 
 #define CONFIG_BAUDRATE 115200

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index c6f1409..c7bc9cd 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -506,10 +506,6 @@
 #define CONFIG_HAS_ETH1
 #define CONFIG_HAS_ETH2
 #define CONFIG_HAS_ETH3
-#define CONFIG_ETHADDR 00:04:9f:ef:01:01
-#define CONFIG_ETH1ADDR        00:04:9f:ef:01:02
-#define CONFIG_ETH2ADDR        00:04:9f:ef:01:03
-#define CONFIG_ETH3ADDR        00:04:9f:ef:01:04
 #endif
 
 #define CONFIG_BAUDRATE 115200
@@ -518,10 +514,6 @@
 #define CONFIG_HOSTNAME        mpc8360erdk
 #define CONFIG_BOOTFILE        uImage
 
-#define CONFIG_IPADDR          10.0.0.99
-#define CONFIG_SERVERIP                10.0.0.2
-#define CONFIG_GATEWAYIP       10.0.0.2
-#define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_ROOTPATH                /nfsroot/
 
 #define        CONFIG_BOOTDELAY 2      /* -1 disables auto-boot */

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 63f1d85..65d49ec 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -637,9 +637,7 @@ extern int board_pci_host_broken(void);
 
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR         00:E0:0C:00:83:79
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR                00:E0:0C:00:83:78
 #endif
 
 #define CONFIG_BAUDRATE 115200

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 913184c..ca60272 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -643,20 +643,8 @@
  */
 #define CONFIG_ENV_OVERWRITE
 
-#ifdef CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR         00:04:9f:ef:04:01
-#endif
-
-#ifdef CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR                00:04:9f:ef:04:02
-#endif
-
 #define CONFIG_HAS_FSL_DR_USB
 
-#define CONFIG_IPADDR          10.0.0.2
-#define CONFIG_SERVERIP                10.0.0.1
-#define CONFIG_GATEWAYIP       10.0.0.1
-#define CONFIG_NETMASK         255.0.0.0
 #define CONFIG_NETDEV          eth1
 
 #define CONFIG_HOSTNAME                mpc837x_rdb

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 7bef119..4ea65ce 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -631,21 +631,13 @@
 
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_HAS_ETH0
-#define CONFIG_ETHADDR         00:a0:1e:a0:13:8d
 #define CONFIG_HAS_ETH1
-#define CONFIG_ETH1ADDR                00:a0:1e:a0:13:8e
 #endif
 
-#define CONFIG_IPADDR          192.168.1.234
-
 #define CONFIG_HOSTNAME                SBC8349
 #define CONFIG_ROOTPATH                /tftpboot/rootfs
 #define CONFIG_BOOTFILE                uImage
 
-#define CONFIG_SERVERIP                192.168.1.1
-#define CONFIG_GATEWAYIP       192.168.1.1
-#define CONFIG_NETMASK         255.255.255.0
-
 #define CONFIG_LOADADDR                800000  /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */