mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-01-10 12:18:55 +00:00
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:
parent
c73fdc2f5d
commit
fd5a6c07c9
4 changed files with 2 additions and 20 deletions
|
@ -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)
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -74,6 +74,7 @@
|
|||
|
||||
#define CONFIG_ETHER_INDEX 1
|
||||
#define CONFIG_ETHER_ON_FCC1
|
||||
#define CONFIG_HAS_ETH0
|
||||
#define FCC_ENET
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue