xpedite1k: Remove support for reading MACs from EEPROM

By default, the XPedite1000 comes installed with xMon, a proprietary
bootloader.  xMon stores its MAC address in an onboard EEPROM.  Rather
than requiring a non-standard location in the EEPROM to be reserved for
MAC addresses, store the MAC addresses in U-Boot's standard environment.
A U-Boot application or OS application can be used to migrate xMon MAC
addresses to U-Boot's environment if necessary.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/board/xpedite1k/xpedite1k.c b/board/xpedite1k/xpedite1k.c
index 8a4e76c0ffd7e08a77934d3eeb29a32ba5a2a4d0..36a133f6f109e3ad9cb418d557e8a88f34a26352 100644 (file)
--- a/board/xpedite1k/xpedite1k.c
+++ b/board/xpedite1k/xpedite1k.c
@@ -235,64 +235,4 @@ ulong post_word_load (void)
 
        return *save_addr;
 }
-#endif
-
-/*-----------------------------------------------------------------------------
- * board_get_enetaddr -- Read the MAC Addresses in the I2C EEPROM
- *-----------------------------------------------------------------------------
- */
-static int read_i2c;
-static void board_get_enetaddr(uchar *enet)
-{
-       int i;
-       unsigned char buff[0x100], *cp;
-
-       if (read_i2c)
-               return;
-
-       /* Initialize I2C                                       */
-       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-
-       /* Read 256 bytes in EEPROM                             */
-       i2c_read (0x50, 0, 1, buff, 0x100);
-
-       cp = &buff[0xF4];
-       for (i = 0; i < 6; i++,cp++)
-               enet[i] = *cp;
-
-       printf("MAC address = %pM\n", enet);
-       read_i2c = 1;
-}
-
-int misc_init_r(void)
-{
-       uchar enetaddr[6], i2c_enetaddr[6];
-
-       if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
-               board_get_enetaddr(i2c_enetaddr);
-               eth_setenv_enetaddr("ethaddr", i2c_enetaddr);
-       }
-
-#ifdef CONFIG_HAS_ETH1
-       if (!eth_getenv_enetaddr("eth1addr", enetaddr)) {
-               board_get_enetaddr(i2c_enetaddr);
-               eth_setenv_enetaddr("eth1addr", i2c_enetaddr);
-       }
-#endif
-
-#ifdef CONFIG_HAS_ETH2
-       if (!eth_getenv_enetaddr("eth2addr", enetaddr)) {
-               board_get_enetaddr(i2c_enetaddr);
-               eth_setenv_enetaddr("eth2addr", i2c_enetaddr);
-       }
-#endif
-
-#ifdef CONFIG_HAS_ETH3
-       if (!eth_getenv_enetaddr("eth3addr", enetaddr)) {
-               board_get_enetaddr(i2c_enetaddr);
-               eth_setenv_enetaddr("eth3addr", i2c_enetaddr);
-       }
-#endif
-
-       return 0;
-}
+#endif
\ No newline at end of file

diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index 57878a22fdf58ec8225a7ef7cf1d67a519c9d314..93c4b0aeea1f9ed5d7d42848d27b90019b9e02bf 100644 (file)
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -38,7 +38,6 @@
 #define CONFIG_440             1
 #define CONFIG_440GX           1               /* 440 GX */
 #define CONFIG_BOARD_EARLY_INIT_F 1            /* Call board_pre_init  */
-#define CONFIG_MISC_INIT_R
 #define CONFIG_SYS_CLK_FREQ    33333333        /* external freq to pll */