mpc8260: remove Ethernet node fixup to use generic FDT code.

Remove Ethernet node fixup from mgcoge and muas3001 boards and modify its
configs for the common mpc8260 code to use generic Ethernet fixup.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
Tested-by: Heiko Schocher <hs@denx.de>

diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
index d24a4b57698ca1d20a2611d2c727459f6899f365..b16a01ccc5bc75fd369fc3f295411ad2630709cd 100644 (file)
--- a/board/keymile/mgcoge/mgcoge.c
+++ b/board/keymile/mgcoge/mgcoge.c
@@ -25,7 +25,6 @@
 #include <mpc8260.h>
 #include <ioports.h>
 #include <malloc.h>
-#include <net.h>
 #include <asm/io.h>
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
@@ -373,10 +372,6 @@ void ft_blob_update (void *blob, bd_t *bd)
        flash_reg[5] = cpu_to_be32 (info->size);
        fdt_set_node_and_value (blob, "/localbus/flash@5,0", "reg", flash_reg,
                                sizeof (flash_reg));
-
-       /* MAC addr */
-       fdt_set_node_and_value (blob, "/soc/cpm/ethernet", "mac-address",
-                               bd->bi_enetaddr, sizeof (u8) * 6);
 }
 
 void ft_board_setup (void *blob, bd_t *bd)

diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index bf4ccb6e1901cd9e540c542d10502793cfa5464b..36caed813dde8c2a23895f91a02f5e56e35c698f 100644 (file)
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -342,21 +342,6 @@ void ft_blob_update (void *blob, bd_t *bd)
                printf ("ft_blob_update(): cannot find /localbus node "
                        "err:%s\n", fdt_strerror (nodeoffset));
        }
-       /* MAC Adresse */
-       nodeoffset = fdt_path_offset (blob, "/soc/cpm/ethernet");
-       if (nodeoffset >= 0) {
-               uchar ethaddr[6];
-               eth_getenv_enetaddr("ethaddr", ethaddr);
-               ret = fdt_setprop (blob, nodeoffset, "mac-address", ethaddr,
-                                       sizeof (uchar) * 6);
-       if (ret < 0)
-               printf ("ft_blob_update): cannot set /soc/cpm/ethernet/mac-address "
-                       "property err:%s\n", fdt_strerror (ret));
-       } else {
-               /* memory node is required in dts */
-               printf ("ft_blob_update(): cannot find /soc/cpm/ethernet node "
-                       "err:%s\n", fdt_strerror (nodeoffset));
-       }
 
        /* baudrate */
        nodeoffset = fdt_path_offset (blob, "/soc/cpm/serial");

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index ea14948c4651c45b93b05de5484ea5bb27777f9c..b955749d8fcb44c2367ed5911025ba6cfc004e31 100644 (file)
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -70,6 +70,7 @@
 #define CONFIG_NET_MULTI       1
 
 #define CONFIG_ETHER_INDEX     4
+#define CONFIG_HAS_ETH0
 #define CONFIG_SYS_SCC_TOUT_LOOP       10000000
 
 # define CONFIG_SYS_CMXSCR_VALUE       (CMXSCR_RS4CS_CLK7 | CMXSCR_TS4CS_CLK8)

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index f031a17b271667258bb6c25bcad498f2e27c6427..ae033b2da55a81e0929e5873f4df4de1cba97d93 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -74,6 +74,7 @@
 
 #define CONFIG_ETHER_INDEX     1
 #define CONFIG_ETHER_ON_FCC1
+#define CONFIG_HAS_ETH0
 #define FCC_ENET
 
 /*