mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 13:41:31 +00:00
Merge git://git.denx.de/u-boot-net
This commit is contained in:
commit
ec6bc928bb
7 changed files with 24 additions and 21 deletions
|
@ -476,6 +476,7 @@ int board_eth_init(bd_t *bis)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PHY_INTERFACE_MODE_RGMII:
|
case PHY_INTERFACE_MODE_RGMII:
|
||||||
|
case PHY_INTERFACE_MODE_RGMII_TXID:
|
||||||
if (i == FM1_DTSEC3)
|
if (i == FM1_DTSEC3)
|
||||||
mdio_mux[i] = EMI1_RGMII1;
|
mdio_mux[i] = EMI1_RGMII1;
|
||||||
else if (i == FM1_DTSEC4)
|
else if (i == FM1_DTSEC4)
|
||||||
|
|
|
@ -397,6 +397,7 @@ int board_eth_init(bd_t *bis)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PHY_INTERFACE_MODE_RGMII:
|
case PHY_INTERFACE_MODE_RGMII:
|
||||||
|
case PHY_INTERFACE_MODE_RGMII_TXID:
|
||||||
if (i == FM1_DTSEC3)
|
if (i == FM1_DTSEC3)
|
||||||
mdio_mux[i] = EMI1_RGMII1;
|
mdio_mux[i] = EMI1_RGMII1;
|
||||||
else if (i == FM1_DTSEC4)
|
else if (i == FM1_DTSEC4)
|
||||||
|
|
|
@ -391,7 +391,7 @@ static int fec_init(struct eth_device *dev, bd_t * bd)
|
||||||
/* Set Opcode/Pause Duration Register */
|
/* Set Opcode/Pause Duration Register */
|
||||||
fecp->opd = 0x00010020;
|
fecp->opd = 0x00010020;
|
||||||
|
|
||||||
/* Setup Buffers and Buffer Desriptors */
|
/* Setup Buffers and Buffer Descriptors */
|
||||||
info->rxIdx = 0;
|
info->rxIdx = 0;
|
||||||
info->txIdx = 0;
|
info->txIdx = 0;
|
||||||
|
|
||||||
|
|
|
@ -465,7 +465,7 @@ int fec_init(struct eth_device *dev, bd_t * bd)
|
||||||
fecp->emrbr = PKT_MAXBLR_SIZE;
|
fecp->emrbr = PKT_MAXBLR_SIZE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Setup Buffers and Buffer Desriptors
|
* Setup Buffers and Buffer Descriptors
|
||||||
*/
|
*/
|
||||||
info->rxIdx = 0;
|
info->rxIdx = 0;
|
||||||
info->txIdx = 0;
|
info->txIdx = 0;
|
||||||
|
|
|
@ -540,7 +540,7 @@ static void mvneta_txq_pend_desc_add(struct mvneta_port *pp,
|
||||||
u32 val;
|
u32 val;
|
||||||
|
|
||||||
/* Only 255 descriptors can be added at once ; Assume caller
|
/* Only 255 descriptors can be added at once ; Assume caller
|
||||||
* process TX desriptors in quanta less than 256
|
* process TX descriptors in quanta less than 256
|
||||||
*/
|
*/
|
||||||
val = pend_desc;
|
val = pend_desc;
|
||||||
mvreg_write(pp, MVNETA_TXQ_UPDATE_REG(txq->id), val);
|
mvreg_write(pp, MVNETA_TXQ_UPDATE_REG(txq->id), val);
|
||||||
|
|
|
@ -95,17 +95,21 @@ static int rtl8211f_config(struct phy_device *phydev)
|
||||||
|
|
||||||
phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, BMCR_RESET);
|
phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, BMCR_RESET);
|
||||||
|
|
||||||
if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
|
|
||||||
/* enable TXDLY */
|
|
||||||
phy_write(phydev, MDIO_DEVAD_NONE,
|
phy_write(phydev, MDIO_DEVAD_NONE,
|
||||||
MIIM_RTL8211F_PAGE_SELECT, 0xd08);
|
MIIM_RTL8211F_PAGE_SELECT, 0xd08);
|
||||||
reg = phy_read(phydev, MDIO_DEVAD_NONE, 0x11);
|
reg = phy_read(phydev, MDIO_DEVAD_NONE, 0x11);
|
||||||
|
|
||||||
|
/* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */
|
||||||
|
if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
|
||||||
|
phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
|
||||||
reg |= MIIM_RTL8211F_TX_DELAY;
|
reg |= MIIM_RTL8211F_TX_DELAY;
|
||||||
|
else
|
||||||
|
reg &= ~MIIM_RTL8211F_TX_DELAY;
|
||||||
|
|
||||||
phy_write(phydev, MDIO_DEVAD_NONE, 0x11, reg);
|
phy_write(phydev, MDIO_DEVAD_NONE, 0x11, reg);
|
||||||
/* restore to default page 0 */
|
/* restore to default page 0 */
|
||||||
phy_write(phydev, MDIO_DEVAD_NONE,
|
phy_write(phydev, MDIO_DEVAD_NONE,
|
||||||
MIIM_RTL8211F_PAGE_SELECT, 0x0);
|
MIIM_RTL8211F_PAGE_SELECT, 0x0);
|
||||||
}
|
|
||||||
|
|
||||||
/* Set green LED for Link, yellow LED for Active */
|
/* Set green LED for Link, yellow LED for Active */
|
||||||
phy_write(phydev, MDIO_DEVAD_NONE,
|
phy_write(phydev, MDIO_DEVAD_NONE,
|
||||||
|
|
11
net/nfs.h
11
net/nfs.h
|
@ -36,16 +36,13 @@
|
||||||
#define NFSERR_ISDIR 21
|
#define NFSERR_ISDIR 21
|
||||||
#define NFSERR_INVAL 22
|
#define NFSERR_INVAL 22
|
||||||
|
|
||||||
/* Block size used for NFS read accesses. A RPC reply packet (including all
|
/*
|
||||||
|
* Block size used for NFS read accesses. A RPC reply packet (including all
|
||||||
* headers) must fit within a single Ethernet frame to avoid fragmentation.
|
* headers) must fit within a single Ethernet frame to avoid fragmentation.
|
||||||
* However, if CONFIG_IP_DEFRAG is set, the config file may want to use a
|
* However, if CONFIG_IP_DEFRAG is set, a bigger value could be used. In any
|
||||||
* bigger value. In any case, most NFS servers are optimized for a power of 2.
|
* case, most NFS servers are optimized for a power of 2.
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_NFS_READ_SIZE
|
|
||||||
#define NFS_READ_SIZE CONFIG_NFS_READ_SIZE
|
|
||||||
#else
|
|
||||||
#define NFS_READ_SIZE 1024 /* biggest power of two that fits Ether frame */
|
#define NFS_READ_SIZE 1024 /* biggest power of two that fits Ether frame */
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Values for Accept State flag on RPC answers (See: rfc1831) */
|
/* Values for Accept State flag on RPC answers (See: rfc1831) */
|
||||||
enum rpc_accept_stat {
|
enum rpc_accept_stat {
|
||||||
|
|
Loading…
Add table
Reference in a new issue