Skip to contentSkip to conversation

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

PATCH New Marcel Ziswiler 2 participants 2 messages Sep 11, 2009 – Sep 15, 2009

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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.

---
Changes since v1:
- Added Heiko's tested-by
Changes since v2:
- Re-based to origin/master

 board/keymile/mgcoge/mgcoge.c |    5 -----
 board/muas3001/muas3001.c     |   15 ---------------
 include/configs/mgcoge.h      |    1 +
 include/configs/muas3001.h    |    1 +
 4 files changed, 2 insertions(+), 20 deletions(-)
board/keymile/mgcoge/mgcoge.c +0 -5
index d24a4b5..b16a01c 100644
@@ -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 at 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)
board/muas3001/muas3001.c +0 -15
index bf4ccb6..36caed8 100644
@@ -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");
include/configs/mgcoge.h +1 -0
index ea14948..b955749 100644
@@ -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)
include/configs/muas3001.h +1 -0
index f031a17..ae033b2 100644
@@ -74,6 +74,7 @@
 
 #define CONFIG_ETHER_INDEX	1
 #define CONFIG_ETHER_ON_FCC1
+#define CONFIG_HAS_ETH0
 #define FCC_ENET
 
 /*
Signature · 1 line
1.6.4.2
#1 lore raw

PATCH v3 1/1 mpc8260: remove Ethernet node fixup to use generic FDT code.

Dear Marcel Ziswiler,

Quoted 11 lines · In message <14622923.97201252669833688.JavaMail.servlet@perfora> you wrote:

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

---
Changes since v1:
- Added Heiko's tested-by
Changes since v2:
- Re-based to origin/master

Quoted 5 lines
 board/keymile/mgcoge/mgcoge.c |    5 -----
 board/muas3001/muas3001.c     |   15 ---------------
 include/configs/mgcoge.h      |    1 +
 include/configs/muas3001.h    |    1 +
 4 files changed, 2 insertions(+), 20 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The X11 source code style is ATROCIOUS and should not be used  as  a
model."                                                   - Doug Gwyn