net ppc: fix ethernet device names with spaces
since commit 1384f3bb8a
ethernet names
with spaces drop a
Warning: eth device name has a space!
message. This patch fix it for:
- "FEC ETHERNET" devices found on
mpc512x, mpc5xxx, mpc8xx and mpc8220 boards.
renamed to "FEC".
- "SCC ETHERNET" devices found on
mpc8xx, mpc82xx based boards. Renamed to "SCC".
- "HDLC ETHERNET" devices found on mpc8xx boards
Renamed to "HDLC"
- "FCC ETHERNET" devices found on mpc8260 and mpc85xx based
boards. Renamed to "FCC"
Tested on the kup4k board.
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
parent
f699fe1e1f
commit
48690d8024
8
README
8
README
|
@ -3158,10 +3158,10 @@ List of environment variables (most likely not complete):
|
||||||
interface is currently active. For example you
|
interface is currently active. For example you
|
||||||
can do the following
|
can do the following
|
||||||
|
|
||||||
=> setenv ethact FEC ETHERNET
|
=> setenv ethact FEC
|
||||||
=> ping 192.168.0.1 # traffic sent on FEC ETHERNET
|
=> ping 192.168.0.1 # traffic sent on FEC
|
||||||
=> setenv ethact SCC ETHERNET
|
=> setenv ethact SCC
|
||||||
=> ping 10.0.0.1 # traffic sent on SCC ETHERNET
|
=> ping 10.0.0.1 # traffic sent on SCC
|
||||||
|
|
||||||
ethrotate - When set to "no" U-Boot does not go through all
|
ethrotate - When set to "no" U-Boot does not go through all
|
||||||
available network interfaces.
|
available network interfaces.
|
||||||
|
|
|
@ -840,7 +840,7 @@ int mpc8220_fec_initialize (bd_t * bis)
|
||||||
dev->send = mpc8220_fec_send;
|
dev->send = mpc8220_fec_send;
|
||||||
dev->recv = mpc8220_fec_recv;
|
dev->recv = mpc8220_fec_recv;
|
||||||
|
|
||||||
sprintf (dev->name, "FEC ETHERNET");
|
sprintf (dev->name, "FEC");
|
||||||
eth_register (dev);
|
eth_register (dev);
|
||||||
|
|
||||||
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
|
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
|
||||||
|
|
|
@ -383,7 +383,7 @@ int fec_initialize(bd_t *bis)
|
||||||
dev = (struct eth_device*) malloc(sizeof *dev);
|
dev = (struct eth_device*) malloc(sizeof *dev);
|
||||||
memset(dev, 0, sizeof *dev);
|
memset(dev, 0, sizeof *dev);
|
||||||
|
|
||||||
sprintf(dev->name, "FCC%d ETHERNET",
|
sprintf(dev->name, "FCC%d",
|
||||||
ether_fcc_info[i].ether_index + 1);
|
ether_fcc_info[i].ether_index + 1);
|
||||||
dev->priv = ðer_fcc_info[i];
|
dev->priv = ðer_fcc_info[i];
|
||||||
dev->init = fec_init;
|
dev->init = fec_init;
|
||||||
|
|
|
@ -375,7 +375,7 @@ int mpc82xx_scc_enet_initialize(bd_t *bis)
|
||||||
dev = (struct eth_device *) malloc(sizeof *dev);
|
dev = (struct eth_device *) malloc(sizeof *dev);
|
||||||
memset(dev, 0, sizeof *dev);
|
memset(dev, 0, sizeof *dev);
|
||||||
|
|
||||||
sprintf(dev->name, "SCC ETHERNET");
|
sprintf(dev->name, "SCC");
|
||||||
dev->init = sec_init;
|
dev->init = sec_init;
|
||||||
dev->halt = sec_halt;
|
dev->halt = sec_halt;
|
||||||
dev->send = sec_send;
|
dev->send = sec_send;
|
||||||
|
|
|
@ -446,7 +446,7 @@ int fec_initialize(bd_t *bis)
|
||||||
dev = (struct eth_device*) malloc(sizeof *dev);
|
dev = (struct eth_device*) malloc(sizeof *dev);
|
||||||
memset(dev, 0, sizeof *dev);
|
memset(dev, 0, sizeof *dev);
|
||||||
|
|
||||||
sprintf(dev->name, "FCC%d ETHERNET",
|
sprintf(dev->name, "FCC%d",
|
||||||
ether_fcc_info[i].ether_index + 1);
|
ether_fcc_info[i].ether_index + 1);
|
||||||
dev->priv = ðer_fcc_info[i];
|
dev->priv = ðer_fcc_info[i];
|
||||||
dev->init = fec_init;
|
dev->init = fec_init;
|
||||||
|
|
|
@ -164,9 +164,9 @@ int fec_initialize(bd_t *bis)
|
||||||
/* for FEC1 make sure that the name of the interface is the same
|
/* for FEC1 make sure that the name of the interface is the same
|
||||||
as the old one for compatibility reasons */
|
as the old one for compatibility reasons */
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
sprintf (dev->name, "FEC ETHERNET");
|
sprintf (dev->name, "FEC");
|
||||||
} else {
|
} else {
|
||||||
sprintf (dev->name, "FEC%d ETHERNET",
|
sprintf (dev->name, "FEC%d",
|
||||||
ether_fcc_info[i].ether_index + 1);
|
ether_fcc_info[i].ether_index + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ int scc_initialize(bd_t *bis)
|
||||||
dev = (struct eth_device*) malloc(sizeof *dev);
|
dev = (struct eth_device*) malloc(sizeof *dev);
|
||||||
memset(dev, 0, sizeof *dev);
|
memset(dev, 0, sizeof *dev);
|
||||||
|
|
||||||
sprintf(dev->name, "SCC ETHERNET");
|
sprintf(dev->name, "SCC");
|
||||||
dev->iobase = 0;
|
dev->iobase = 0;
|
||||||
dev->priv = 0;
|
dev->priv = 0;
|
||||||
dev->init = scc_init;
|
dev->init = scc_init;
|
||||||
|
|
|
@ -236,7 +236,7 @@ void reset_phy (void)
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
||||||
/* reset PHY */
|
/* reset PHY */
|
||||||
miiphy_reset("FCC1 ETHERNET", 0x0);
|
miiphy_reset("FCC1", 0x0);
|
||||||
|
|
||||||
/* change PHY address to 0x02 */
|
/* change PHY address to 0x02 */
|
||||||
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
||||||
|
|
|
@ -198,7 +198,7 @@ void reset_phy (void)
|
||||||
iop->pdat |= 0x00080000;
|
iop->pdat |= 0x00080000;
|
||||||
for (i=0; i<100; i++) {
|
for (i=0; i<100; i++) {
|
||||||
udelay(20000);
|
udelay(20000);
|
||||||
if (bb_miiphy_read("FCC1 ETHERNET", CONFIG_SYS_PHY_ADDR,2,&val ) == 0) {
|
if (bb_miiphy_read("FCC1", CONFIG_SYS_PHY_ADDR,2,&val ) == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,7 +40,7 @@ extern char keymile_slot; /* our slot number in the backplane */
|
||||||
#define TOUT_LOOP 50000
|
#define TOUT_LOOP 50000
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Since, except during initialization, ethact is always HDLC ETHERNET
|
* Since, except during initialization, ethact is always HDLC
|
||||||
* while we're in the driver, just use serial_printf() everywhere for
|
* while we're in the driver, just use serial_printf() everywhere for
|
||||||
* output. This avoids possible conflicts when netconsole is being
|
* output. This avoids possible conflicts when netconsole is being
|
||||||
* used.
|
* used.
|
||||||
|
@ -124,7 +124,7 @@ int keymile_hdlc_enet_initialize(bd_t *bis)
|
||||||
seth = dev;
|
seth = dev;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sprintf(dev->name, "HDLC ETHERNET");
|
sprintf(dev->name, "HDLC");
|
||||||
dev->init = keymile_hdlc_enet_init;
|
dev->init = keymile_hdlc_enet_init;
|
||||||
dev->halt = keymile_hdlc_enet_halt;
|
dev->halt = keymile_hdlc_enet_halt;
|
||||||
dev->send = keymile_hdlc_enet_send;
|
dev->send = keymile_hdlc_enet_send;
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
char keymile_slot; /* our slot number in the backplane */
|
char keymile_slot; /* our slot number in the backplane */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Since, except during initialization, ethact is always HDLC ETHERNET
|
* Since, except during initialization, ethact is always HDLC
|
||||||
* while we're in the driver, just use serial_printf() everywhere for
|
* while we're in the driver, just use serial_printf() everywhere for
|
||||||
* output. This avoids possible conflicts when netconsole is being
|
* output. This avoids possible conflicts when netconsole is being
|
||||||
* used.
|
* used.
|
||||||
|
|
|
@ -90,8 +90,8 @@ void reset_phy(void)
|
||||||
{
|
{
|
||||||
unsigned short mode_control;
|
unsigned short mode_control;
|
||||||
|
|
||||||
miiphy_read("FEC ETHERNET", CONFIG_PHY_ADDR, 0x15, &mode_control);
|
miiphy_read("FEC", CONFIG_PHY_ADDR, 0x15, &mode_control);
|
||||||
miiphy_write("FEC ETHERNET", CONFIG_PHY_ADDR, 0x15,
|
miiphy_write("FEC", CONFIG_PHY_ADDR, 0x15,
|
||||||
mode_control & 0xfffe);
|
mode_control & 0xfffe);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -225,7 +225,7 @@ void reset_phy (void)
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
||||||
/* reset PHY */
|
/* reset PHY */
|
||||||
miiphy_reset("FCC1 ETHERNET", 0x0);
|
miiphy_reset("FCC1", 0x0);
|
||||||
|
|
||||||
/* change PHY address to 0x02 */
|
/* change PHY address to 0x02 */
|
||||||
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
||||||
|
|
|
@ -239,7 +239,7 @@ reset_phy(void)
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
||||||
/* reset PHY */
|
/* reset PHY */
|
||||||
miiphy_reset("FCC1 ETHERNET", 0x0);
|
miiphy_reset("FCC1", 0x0);
|
||||||
|
|
||||||
/* change PHY address to 0x02 */
|
/* change PHY address to 0x02 */
|
||||||
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
||||||
|
|
|
@ -238,7 +238,7 @@ reset_phy(void)
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
#if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC)
|
||||||
/* reset PHY */
|
/* reset PHY */
|
||||||
miiphy_reset("FCC1 ETHERNET", 0x0);
|
miiphy_reset("FCC1", 0x0);
|
||||||
|
|
||||||
/* change PHY address to 0x02 */
|
/* change PHY address to 0x02 */
|
||||||
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028);
|
||||||
|
|
|
@ -481,12 +481,12 @@ void reset_phys(void)
|
||||||
mii_init();
|
mii_init();
|
||||||
|
|
||||||
for (phyno = 0; phyno < 32; ++phyno) {
|
for (phyno = 0; phyno < 32; ++phyno) {
|
||||||
miiphy_read("FEC ETHERNET", phyno, PHY_PHYIDR1, &v);
|
miiphy_read("FEC", phyno, PHY_PHYIDR1, &v);
|
||||||
if (v == 0xFFFF)
|
if (v == 0xFFFF)
|
||||||
continue;
|
continue;
|
||||||
miiphy_write("FEC ETHERNET", phyno, PHY_BMCR, PHY_BMCR_POWD);
|
miiphy_write("FEC", phyno, PHY_BMCR, PHY_BMCR_POWD);
|
||||||
udelay(10000);
|
udelay(10000);
|
||||||
miiphy_write("FEC ETHERNET", phyno, PHY_BMCR, PHY_BMCR_RESET | PHY_BMCR_AUTON);
|
miiphy_write("FEC", phyno, PHY_BMCR, PHY_BMCR_RESET | PHY_BMCR_AUTON);
|
||||||
udelay(10000);
|
udelay(10000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -745,13 +745,13 @@ int last_stage_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
ret = miiphy_read("FEC ETHERNET", phy[i], PHY_BMCR, ®);
|
ret = miiphy_read("FEC", phy[i], PHY_BMCR, ®);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printf("Cannot read BMCR on PHY %d\n", phy[i]);
|
printf("Cannot read BMCR on PHY %d\n", phy[i]);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* Auto-negotiation off, hard set full duplex, 100Mbps */
|
/* Auto-negotiation off, hard set full duplex, 100Mbps */
|
||||||
ret = miiphy_write("FEC ETHERNET", phy[i],
|
ret = miiphy_write("FEC", phy[i],
|
||||||
PHY_BMCR, (reg | PHY_BMCR_100MB |
|
PHY_BMCR, (reg | PHY_BMCR_100MB |
|
||||||
PHY_BMCR_DPLX) & ~PHY_BMCR_AUTON);
|
PHY_BMCR_DPLX) & ~PHY_BMCR_AUTON);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
|
@ -93,7 +93,7 @@ nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
|
||||||
addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1
|
addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1
|
||||||
=> run nfsargs addip
|
=> run nfsargs addip
|
||||||
=> tftp 900000 /path/to/tftp/location/kernel.itb
|
=> tftp 900000 /path/to/tftp/location/kernel.itb
|
||||||
Using FEC ETHERNET device
|
Using FEC device
|
||||||
TFTP from server 192.168.1.1; our IP address is 192.168.160.5
|
TFTP from server 192.168.1.1; our IP address is 192.168.160.5
|
||||||
Filename '/path/to/tftp/location/kernel.itb'.
|
Filename '/path/to/tftp/location/kernel.itb'.
|
||||||
Load address: 0x900000
|
Load address: 0x900000
|
||||||
|
@ -207,7 +207,7 @@ inspected and booted:
|
||||||
|
|
||||||
[on the target system]
|
[on the target system]
|
||||||
=> tftp 900000 /path/to/tftp/location/kernel_fdt.itb
|
=> tftp 900000 /path/to/tftp/location/kernel_fdt.itb
|
||||||
Using FEC ETHERNET device
|
Using FEC device
|
||||||
TFTP from server 192.168.1.1; our IP address is 192.168.160.5
|
TFTP from server 192.168.1.1; our IP address is 192.168.160.5
|
||||||
Filename '/path/to/tftp/location/kernel_fdt.itb'.
|
Filename '/path/to/tftp/location/kernel_fdt.itb'.
|
||||||
Load address: 0x900000
|
Load address: 0x900000
|
||||||
|
|
|
@ -637,7 +637,7 @@ int mpc512x_fec_initialize (bd_t * bis)
|
||||||
dev->send = mpc512x_fec_send;
|
dev->send = mpc512x_fec_send;
|
||||||
dev->recv = mpc512x_fec_recv;
|
dev->recv = mpc512x_fec_recv;
|
||||||
|
|
||||||
sprintf (dev->name, "FEC ETHERNET");
|
sprintf (dev->name, "FEC");
|
||||||
eth_register (dev);
|
eth_register (dev);
|
||||||
|
|
||||||
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
|
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
|
||||||
|
|
|
@ -485,7 +485,6 @@
|
||||||
|
|
||||||
#undef CONFIG_SCC1_ENET
|
#undef CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
/* #define CONFIG_ETHPRIME "FEC ETHERNET" */
|
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -65,8 +65,8 @@
|
||||||
#undef CONFIG_BOOTARGS
|
#undef CONFIG_BOOTARGS
|
||||||
|
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"ethprime=FEC ETHERNET\0" \
|
"ethprime=FEC\0" \
|
||||||
"ethact=FEC ETHERNET\0" \
|
"ethact=FEC\0" \
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
||||||
"nfsroot=${serverip}:${rootpath}\0" \
|
"nfsroot=${serverip}:${rootpath}\0" \
|
||||||
|
@ -514,7 +514,7 @@
|
||||||
#define CONFIG_MII_INIT 1
|
#define CONFIG_MII_INIT 1
|
||||||
|
|
||||||
#define CONFIG_NET_RETRY_COUNT 3
|
#define CONFIG_NET_RETRY_COUNT 3
|
||||||
#define CONFIG_ETHPRIME "FEC ETHERNET"
|
#define CONFIG_ETHPRIME "FEC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -481,7 +481,7 @@
|
||||||
|
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -516,7 +516,7 @@
|
||||||
|
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -480,7 +480,7 @@
|
||||||
|
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -484,7 +484,7 @@
|
||||||
|
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -486,7 +486,7 @@
|
||||||
#define CONFIG_NET_MULTI
|
#define CONFIG_NET_MULTI
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -487,7 +487,7 @@
|
||||||
#define CONFIG_NET_MULTI
|
#define CONFIG_NET_MULTI
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -506,7 +506,7 @@
|
||||||
|
|
||||||
#define CONFIG_SCC1_ENET
|
#define CONFIG_SCC1_ENET
|
||||||
#define CONFIG_FEC_ENET
|
#define CONFIG_FEC_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -506,7 +506,7 @@
|
||||||
switching to another netwok (if the
|
switching to another netwok (if the
|
||||||
tried network is unreachable) */
|
tried network is unreachable) */
|
||||||
|
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
#define CONFIG_OF_LIBFDT 1
|
#define CONFIG_OF_LIBFDT 1
|
||||||
|
|
|
@ -147,7 +147,7 @@
|
||||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||||
#define CONFIG_ENV_IN_OWN_SECT 1
|
#define CONFIG_ENV_IN_OWN_SECT 1
|
||||||
#define CONFIG_AUTO_COMPLETE 1
|
#define CONFIG_AUTO_COMPLETE 1
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3 ETHERNET"
|
#define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3"
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_KGDB)
|
#if defined(CONFIG_CMD_KGDB)
|
||||||
#undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
|
#undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0" \
|
"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0" \
|
||||||
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
||||||
"nfsroot=$(serverip):$(rootpath)\0" \
|
"nfsroot=$(serverip):$(rootpath)\0" \
|
||||||
"ethact=FEC ETHERNET\0" \
|
"ethact=FEC\0 " \
|
||||||
"update=prot off ff800000 ff81ffff; era ff800000 ff81ffff; " \
|
"update=prot off ff800000 ff81ffff; era ff800000 ff81ffff; " \
|
||||||
"cp.b 200000 ff800000 $(filesize);" \
|
"cp.b 200000 ff800000 $(filesize);" \
|
||||||
"prot on ff800000 ff81ffff\0" \
|
"prot on ff800000 ff81ffff\0" \
|
||||||
|
|
|
@ -139,8 +139,8 @@
|
||||||
|
|
||||||
#ifdef CONFIG_IO_MUXING
|
#ifdef CONFIG_IO_MUXING
|
||||||
#define CONFIG_KM_DEF_ENV_IOMUX \
|
#define CONFIG_KM_DEF_ENV_IOMUX \
|
||||||
"nc=setenv ethact HDLC ETHERNET \0" \
|
"nc=setenv ethact HDLC \0" \
|
||||||
"nce=setenv ethact SCC ETHERNET \0" \
|
"nce=setenv ethact SCC \0" \
|
||||||
"stderr=serial,nc \0" \
|
"stderr=serial,nc \0" \
|
||||||
"stdin=serial,nc \0" \
|
"stdin=serial,nc \0" \
|
||||||
"stdout=serial,nc \0" \
|
"stdout=serial,nc \0" \
|
||||||
|
|
|
@ -280,7 +280,7 @@
|
||||||
#define BOOTFLAG_WARM 0x02 /* Software reboot */
|
#define BOOTFLAG_WARM 0x02 /* Software reboot */
|
||||||
|
|
||||||
#define CONFIG_SCC3_ENET
|
#define CONFIG_SCC3_ENET
|
||||||
#define CONFIG_ETHPRIME "SCC ETHERNET"
|
#define CONFIG_ETHPRIME "SCC"
|
||||||
#define CONFIG_HAS_ETH0
|
#define CONFIG_HAS_ETH0
|
||||||
|
|
||||||
/* pass open firmware flat tree */
|
/* pass open firmware flat tree */
|
||||||
|
|
|
@ -154,7 +154,7 @@
|
||||||
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
"nfsargs=setenv bootargs root=/dev/nfs rw " \
|
||||||
"nfsroot=$(serverip):$(rootpath) wdt=off\0" \
|
"nfsroot=$(serverip):$(rootpath) wdt=off\0" \
|
||||||
"hostname=v38b\0" \
|
"hostname=v38b\0" \
|
||||||
"ethact=FEC ETHERNET\0" \
|
"ethact=FEC\0" \
|
||||||
"rootpath=/opt/eldk-3.1.1/ppc_6xx\0" \
|
"rootpath=/opt/eldk-3.1.1/ppc_6xx\0" \
|
||||||
"update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; " \
|
"update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; " \
|
||||||
"cp.b 200000 ff000000 $(filesize);" \
|
"cp.b 200000 ff000000 $(filesize);" \
|
||||||
|
|
Loading…
Reference in New Issue