V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Marcel Ziswiler 2009-09-11 07:50:33 -04:00 committed by Wolfgang Denk
parent 1c20e4a9fb
commit 3ca55bce9c
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
board/keymile/mgcoge/mgcoge.c
View File

@ -25,7 +25,6 @@
#include <mpc8260.h> #include <mpc8260.h>
#include <ioports.h> #include <ioports.h>
#include <malloc.h> #include <malloc.h>
#include <net.h>
#include <asm/io.h> #include <asm/io.h>
#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) #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); flash_reg[5] = cpu_to_be32 (info->size);
fdt_set_node_and_value (blob, "/localbus/flash@5,0", "reg", flash_reg, fdt_set_node_and_value (blob, "/localbus/flash@5,0", "reg", flash_reg,
sizeof (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) void ft_board_setup (void *blob, bd_t *bd)

15
board/muas3001/muas3001.c
View File

@ -342,21 +342,6 @@ void ft_blob_update (void *blob, bd_t *bd)
printf ("ft_blob_update(): cannot find /localbus node " printf ("ft_blob_update(): cannot find /localbus node "
"err:%s\n", fdt_strerror (nodeoffset)); "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 */ /* baudrate */
nodeoffset = fdt_path_offset (blob, "/soc/cpm/serial"); nodeoffset = fdt_path_offset (blob, "/soc/cpm/serial");

1
include/configs/mgcoge.h
View File

@ -70,6 +70,7 @@
#define CONFIG_NET_MULTI 1 #define CONFIG_NET_MULTI 1
#define CONFIG_ETHER_INDEX 4 #define CONFIG_ETHER_INDEX 4
#define CONFIG_HAS_ETH0
#define CONFIG_SYS_SCC_TOUT_LOOP 10000000 #define CONFIG_SYS_SCC_TOUT_LOOP 10000000
# define CONFIG_SYS_CMXSCR_VALUE (CMXSCR_RS4CS_CLK7 | CMXSCR_TS4CS_CLK8) # define CONFIG_SYS_CMXSCR_VALUE (CMXSCR_RS4CS_CLK7 | CMXSCR_TS4CS_CLK8)

1
include/configs/muas3001.h
View File

@ -74,6 +74,7 @@
#define CONFIG_ETHER_INDEX 1 #define CONFIG_ETHER_INDEX 1
#define CONFIG_ETHER_ON_FCC1 #define CONFIG_ETHER_ON_FCC1
#define CONFIG_HAS_ETH0
#define FCC_ENET #define FCC_ENET
/* /*