Merge branch 'next' of git://git.denx.de/u-boot-net into next
This commit is contained in:
commit
d3870bd2d8
44 changed files with 726 additions and 219 deletions
|
@ -25,6 +25,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <nios-io.h>
|
||||
#if defined(CONFIG_SEVENSEG)
|
||||
#include "../common/sevenseg.h"
|
||||
|
@ -79,3 +80,14 @@ int ide_preinit (void)
|
|||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#if defined(CONFIG_SEVENSEG)
|
||||
#include "../common/sevenseg.h"
|
||||
#endif
|
||||
|
@ -58,3 +59,14 @@ phys_size_t initdram (int board_type)
|
|||
{
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <clps7111.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -58,3 +59,14 @@ int dram_init (void)
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -151,3 +152,14 @@ void show_boot_progress (int status)
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <clps7111.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -52,3 +53,14 @@ int dram_init (void)
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/mx31.h>
|
||||
#include <asm/arch/mx31-regs.h>
|
||||
|
@ -104,3 +105,14 @@ int checkboard (void)
|
|||
printf("Board: MX31ADS\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <clps7111.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -57,3 +58,14 @@ int dram_init (void)
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
|
@ -62,3 +63,14 @@ int dram_init (void)
|
|||
|
||||
return (0);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "vcma9.h"
|
||||
#include "../common/common_util.h"
|
||||
|
||||
#if defined(CONFIG_DRIVER_CS8900)
|
||||
#if defined(CONFIG_CS8900)
|
||||
#include <../drivers/net/cs8900.h>
|
||||
|
||||
static uchar cs8900_chksum(ushort data)
|
||||
|
@ -56,25 +56,33 @@ extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
|||
|
||||
int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||
{
|
||||
struct eth_device *dev;
|
||||
char cs8900_name[10];
|
||||
if (strcmp(argv[1], "info") == 0)
|
||||
{
|
||||
print_vcma9_info();
|
||||
return 0;
|
||||
}
|
||||
#if defined(CONFIG_DRIVER_CS8900)
|
||||
#if defined(CONFIG_CS8900)
|
||||
if (strcmp(argv[1], "cs8900") == 0) {
|
||||
sprintf(cs8900_name, "%s-0", CS8900_DRIVERNAME);
|
||||
dev = eth_get_dev_by_name(cs8900_name);
|
||||
if (!dev) {
|
||||
printf("Couldn't find CS8900 driver");
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(argv[2], "read") == 0) {
|
||||
uchar addr; ushort data;
|
||||
|
||||
addr = simple_strtoul(argv[3], NULL, 16);
|
||||
cs8900_e2prom_read(addr, &data);
|
||||
cs8900_e2prom_read(dev, addr, &data);
|
||||
printf("0x%2.2X: 0x%4.4X\n", addr, data);
|
||||
} else if (strcmp(argv[2], "write") == 0) {
|
||||
uchar addr; ushort data;
|
||||
|
||||
addr = simple_strtoul(argv[3], NULL, 16);
|
||||
data = simple_strtoul(argv[4], NULL, 16);
|
||||
cs8900_e2prom_write(addr, data);
|
||||
cs8900_e2prom_write(dev, addr, data);
|
||||
} else if (strcmp(argv[2], "setaddr") == 0) {
|
||||
uchar addr, i, csum; ushort data;
|
||||
uchar ethaddr[6];
|
||||
|
@ -83,22 +91,22 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
if (eth_getenv_enetaddr("ethaddr", ethaddr)) {
|
||||
addr = 1;
|
||||
data = 0x2158;
|
||||
cs8900_e2prom_write(addr, data);
|
||||
cs8900_e2prom_write(dev, addr, data);
|
||||
csum = cs8900_chksum(data);
|
||||
addr++;
|
||||
for (i = 0; i < 6; i+=2) {
|
||||
data = ethaddr[i+1] << 8 |
|
||||
ethaddr[i];
|
||||
cs8900_e2prom_write(addr, data);
|
||||
cs8900_e2prom_write(dev, addr, data);
|
||||
csum += cs8900_chksum(data);
|
||||
addr++;
|
||||
}
|
||||
/* calculate header link byte */
|
||||
data = 0xA100 | (addr * 2);
|
||||
cs8900_e2prom_write(0, data);
|
||||
cs8900_e2prom_write(dev, 0, data);
|
||||
csum += cs8900_chksum(data);
|
||||
/* write checksum word */
|
||||
cs8900_e2prom_write(addr, (0 - csum) << 8);
|
||||
cs8900_e2prom_write(dev, addr, (0 - csum) << 8);
|
||||
} else {
|
||||
puts("\nplease defined 'ethaddr'\n");
|
||||
}
|
||||
|
@ -106,12 +114,12 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|||
uchar addr = 0, endaddr, csum; ushort data;
|
||||
|
||||
puts("Dump of CS8900 config device: ");
|
||||
cs8900_e2prom_read(addr, &data);
|
||||
cs8900_e2prom_read(dev, addr, &data);
|
||||
if ((data & 0xE000) == 0xA000) {
|
||||
endaddr = (data & 0x00FF) / 2;
|
||||
csum = cs8900_chksum(data);
|
||||
for (addr = 1; addr <= endaddr; addr++) {
|
||||
cs8900_e2prom_read(addr, &data);
|
||||
cs8900_e2prom_read(dev, addr, &data);
|
||||
printf("\n0x%2.2X: 0x%4.4X", addr, data);
|
||||
csum += cs8900_chksum(data);
|
||||
}
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <s3c2410.h>
|
||||
#include <stdio_dev.h>
|
||||
#include <i2c.h>
|
||||
|
@ -349,3 +350,14 @@ void print_vcma9_info(void)
|
|||
Show_VCMA9_Info(s, &s[6]);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
/*#include <mc9328.h>*/
|
||||
#include <asm/arch/imx-regs.h>
|
||||
|
||||
|
@ -167,3 +168,14 @@ int dram_init (void)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <s3c2400.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -110,3 +111,14 @@ static int key_pressed(void)
|
|||
return rc;
|
||||
}
|
||||
#endif /* CONFIG_MODEM_SUPPORT */
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <s3c2410.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -121,3 +122,14 @@ int dram_init (void)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <s3c6400.h>
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
@ -117,3 +118,14 @@ ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t *info)
|
|||
} else
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <s3c2410.h>
|
||||
|
||||
#if defined(CONFIG_CMD_NAND)
|
||||
|
@ -178,3 +179,14 @@ void nand_init(void)
|
|||
printf ("%4lu MB\n", nand_probe((ulong)nand) >> 20);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <nios-io.h>
|
||||
#include <spi.h>
|
||||
|
||||
|
@ -100,3 +101,14 @@ int post_hotkeys_pressed(void)
|
|||
return 0; /* No hotkeys supported */
|
||||
}
|
||||
#endif /* CONFIG_POST */
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
/* #define DEBUG */
|
||||
|
||||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <malloc.h>
|
||||
#include <s3c2400.h>
|
||||
#include <command.h>
|
||||
|
@ -420,3 +421,14 @@ static void tsc2000_set_brightness(void)
|
|||
tsc2000_write(0, 0xb, br & 0xff);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
int rc = 0;
|
||||
#ifdef CONFIG_CS8900
|
||||
rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -30,7 +30,7 @@ COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
|
|||
COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o
|
||||
COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o
|
||||
COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o
|
||||
COBJS-$(CONFIG_DRIVER_CS8900) += cs8900.o
|
||||
COBJS-$(CONFIG_CS8900) += cs8900.o
|
||||
COBJS-$(CONFIG_TULIP) += dc2114x.o
|
||||
COBJS-$(CONFIG_DRIVER_DM9000) += dm9000x.o
|
||||
COBJS-$(CONFIG_DNET) += dnet.o
|
||||
|
|
|
@ -186,6 +186,9 @@ static int bfin_EMAC_recv(struct eth_device *dev)
|
|||
printf("Ethernet: bad frame\n");
|
||||
break;
|
||||
}
|
||||
|
||||
debug("%s: len = %d\n", __func__, length - 4);
|
||||
|
||||
NetRxPackets[rxIdx] =
|
||||
(volatile uchar *)(rxbuf[rxIdx]->FrmData->Dest);
|
||||
NetReceive(NetRxPackets[rxIdx], length - 4);
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
/*
|
||||
* Cirrus Logic CS8900A Ethernet
|
||||
*
|
||||
* (C) 2009 Ben Warren , biggerbadderben@gmail.com
|
||||
* Converted to use CONFIG_NET_MULTI API
|
||||
*
|
||||
* (C) 2003 Wolfgang Denk, wd@denx.de
|
||||
* Extension to synchronize ethaddr environment variable
|
||||
* against value in EEPROM
|
||||
|
@ -38,220 +41,229 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include "cs8900.h"
|
||||
#include <asm/io.h>
|
||||
#include <net.h>
|
||||
#include <malloc.h>
|
||||
#include "cs8900.h"
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
/* packet page register access functions */
|
||||
|
||||
#ifdef CS8900_BUS32
|
||||
#ifdef CONFIG_CS8900_BUS32
|
||||
|
||||
#define REG_WRITE(v, a) writel((v),(a))
|
||||
#define REG_READ(a) readl((a))
|
||||
|
||||
/* we don't need 16 bit initialisation on 32 bit bus */
|
||||
#define get_reg_init_bus(x) get_reg((x))
|
||||
|
||||
#else
|
||||
static unsigned short get_reg_init_bus (int regno)
|
||||
|
||||
#define REG_WRITE(v, a) writew((v),(a))
|
||||
#define REG_READ(a) readw((a))
|
||||
|
||||
static u16 get_reg_init_bus(struct eth_device *dev, int regno)
|
||||
{
|
||||
/* force 16 bit busmode */
|
||||
volatile unsigned char c;
|
||||
volatile u8 c;
|
||||
struct cs8900_priv *priv = (struct cs8900_priv *)(dev->priv);
|
||||
uint8_t volatile * const iob = (uint8_t volatile * const)dev->iobase;
|
||||
|
||||
c = CS8900_BUS16_0;
|
||||
c = CS8900_BUS16_1;
|
||||
c = CS8900_BUS16_0;
|
||||
c = CS8900_BUS16_1;
|
||||
c = CS8900_BUS16_0;
|
||||
c = readb(iob);
|
||||
c = readb(iob + 1);
|
||||
c = readb(iob);
|
||||
c = readb(iob + 1);
|
||||
c = readb(iob);
|
||||
|
||||
CS8900_PPTR = regno;
|
||||
return CS8900_PDATA;
|
||||
REG_WRITE(regno, &priv->regs->pptr);
|
||||
return REG_READ(&priv->regs->pdata);
|
||||
}
|
||||
#endif
|
||||
|
||||
static unsigned short get_reg (int regno)
|
||||
static u16 get_reg(struct eth_device *dev, int regno)
|
||||
{
|
||||
CS8900_PPTR = regno;
|
||||
return CS8900_PDATA;
|
||||
struct cs8900_priv *priv = (struct cs8900_priv *)(dev->priv);
|
||||
REG_WRITE(regno, &priv->regs->pptr);
|
||||
return REG_READ(&priv->regs->pdata);
|
||||
}
|
||||
|
||||
|
||||
static void put_reg (int regno, unsigned short val)
|
||||
static void put_reg(struct eth_device *dev, int regno, u16 val)
|
||||
{
|
||||
CS8900_PPTR = regno;
|
||||
CS8900_PDATA = val;
|
||||
struct cs8900_priv *priv = (struct cs8900_priv *)(dev->priv);
|
||||
REG_WRITE(regno, &priv->regs->pptr);
|
||||
REG_WRITE(val, &priv->regs->pdata);
|
||||
}
|
||||
|
||||
static void eth_reset (void)
|
||||
static void cs8900_reset(struct eth_device *dev)
|
||||
{
|
||||
int tmo;
|
||||
unsigned short us;
|
||||
u16 us;
|
||||
|
||||
/* reset NIC */
|
||||
put_reg (PP_SelfCTL, get_reg (PP_SelfCTL) | PP_SelfCTL_Reset);
|
||||
put_reg(dev, PP_SelfCTL, get_reg(dev, PP_SelfCTL) | PP_SelfCTL_Reset);
|
||||
|
||||
/* wait for 200ms */
|
||||
udelay (200000);
|
||||
udelay(200000);
|
||||
/* Wait until the chip is reset */
|
||||
|
||||
tmo = get_timer (0) + 1 * CONFIG_SYS_HZ;
|
||||
while ((((us = get_reg_init_bus (PP_SelfSTAT)) & PP_SelfSTAT_InitD) == 0)
|
||||
&& tmo < get_timer (0))
|
||||
tmo = get_timer(0) + 1 * CONFIG_SYS_HZ;
|
||||
while ((((us = get_reg_init_bus(dev, PP_SelfSTAT)) &
|
||||
PP_SelfSTAT_InitD) == 0) && tmo < get_timer(0))
|
||||
/*NOP*/;
|
||||
}
|
||||
|
||||
static void eth_reginit (void)
|
||||
static void cs8900_reginit(struct eth_device *dev)
|
||||
{
|
||||
/* receive only error free packets addressed to this card */
|
||||
put_reg (PP_RxCTL, PP_RxCTL_IA | PP_RxCTL_Broadcast | PP_RxCTL_RxOK);
|
||||
put_reg(dev, PP_RxCTL,
|
||||
PP_RxCTL_IA | PP_RxCTL_Broadcast | PP_RxCTL_RxOK);
|
||||
/* do not generate any interrupts on receive operations */
|
||||
put_reg (PP_RxCFG, 0);
|
||||
put_reg(dev, PP_RxCFG, 0);
|
||||
/* do not generate any interrupts on transmit operations */
|
||||
put_reg (PP_TxCFG, 0);
|
||||
put_reg(dev, PP_TxCFG, 0);
|
||||
/* do not generate any interrupts on buffer operations */
|
||||
put_reg (PP_BufCFG, 0);
|
||||
put_reg(dev, PP_BufCFG, 0);
|
||||
/* enable transmitter/receiver mode */
|
||||
put_reg (PP_LineCTL, PP_LineCTL_Rx | PP_LineCTL_Tx);
|
||||
put_reg(dev, PP_LineCTL, PP_LineCTL_Rx | PP_LineCTL_Tx);
|
||||
}
|
||||
|
||||
void cs8900_get_enetaddr (void)
|
||||
void cs8900_get_enetaddr(struct eth_device *dev)
|
||||
{
|
||||
int i;
|
||||
uchar enetaddr[6];
|
||||
|
||||
/* if the env is setup, then bail */
|
||||
if (eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
return;
|
||||
|
||||
/* verify chip id */
|
||||
if (get_reg_init_bus (PP_ChipID) != 0x630e)
|
||||
if (get_reg_init_bus(dev, PP_ChipID) != 0x630e)
|
||||
return;
|
||||
eth_reset ();
|
||||
if ((get_reg (PP_SelfSTAT) & (PP_SelfSTAT_EEPROM | PP_SelfSTAT_EEPROM_OK)) ==
|
||||
(PP_SelfSTAT_EEPROM | PP_SelfSTAT_EEPROM_OK)) {
|
||||
cs8900_reset(dev);
|
||||
if ((get_reg(dev, PP_SelfSTAT) &
|
||||
(PP_SelfSTAT_EEPROM | PP_SelfSTAT_EEPROM_OK)) ==
|
||||
(PP_SelfSTAT_EEPROM | PP_SelfSTAT_EEPROM_OK)) {
|
||||
|
||||
/* Load the MAC from EEPROM */
|
||||
for (i = 0; i < 6 / 2; i++) {
|
||||
unsigned int Addr;
|
||||
for (i = 0; i < 3; i++) {
|
||||
u32 Addr;
|
||||
|
||||
Addr = get_reg (PP_IA + i * 2);
|
||||
enetaddr[i * 2] = Addr & 0xFF;
|
||||
enetaddr[i * 2 + 1] = Addr >> 8;
|
||||
Addr = get_reg(dev, PP_IA + i * 2);
|
||||
dev->enetaddr[i * 2] = Addr & 0xFF;
|
||||
dev->enetaddr[i * 2 + 1] = Addr >> 8;
|
||||
}
|
||||
|
||||
eth_setenv_enetaddr("ethaddr", enetaddr);
|
||||
debug("### Set environment from HW MAC addr = \"%pM\"\n", enetaddr);
|
||||
}
|
||||
}
|
||||
|
||||
void eth_halt (void)
|
||||
void cs8900_halt(struct eth_device *dev)
|
||||
{
|
||||
/* disable transmitter/receiver mode */
|
||||
put_reg (PP_LineCTL, 0);
|
||||
put_reg(dev, PP_LineCTL, 0);
|
||||
|
||||
/* "shutdown" to show ChipID or kernel wouldn't find he cs8900 ... */
|
||||
get_reg_init_bus (PP_ChipID);
|
||||
get_reg_init_bus(dev, PP_ChipID);
|
||||
}
|
||||
|
||||
int eth_init (bd_t * bd)
|
||||
static int cs8900_init(struct eth_device *dev, bd_t * bd)
|
||||
{
|
||||
uchar enetaddr[6];
|
||||
uchar *enetaddr = dev->enetaddr;
|
||||
u16 id;
|
||||
|
||||
/* verify chip id */
|
||||
if (get_reg_init_bus (PP_ChipID) != 0x630e) {
|
||||
printf ("CS8900 Ethernet chip not found?!\n");
|
||||
return 0;
|
||||
id = get_reg_init_bus(dev, PP_ChipID);
|
||||
if (id != 0x630e) {
|
||||
printf ("CS8900 Ethernet chip not found: "
|
||||
"ID=0x%04x instead 0x%04x\n", id, 0x630e);
|
||||
return 1;
|
||||
}
|
||||
|
||||
eth_reset ();
|
||||
cs8900_reset (dev);
|
||||
/* set the ethernet address */
|
||||
eth_getenv_enetaddr("ethaddr", enetaddr);
|
||||
put_reg (PP_IA + 0, enetaddr[0] | (enetaddr[1] << 8));
|
||||
put_reg (PP_IA + 2, enetaddr[2] | (enetaddr[3] << 8));
|
||||
put_reg (PP_IA + 4, enetaddr[4] | (enetaddr[5] << 8));
|
||||
put_reg(dev, PP_IA + 0, enetaddr[0] | (enetaddr[1] << 8));
|
||||
put_reg(dev, PP_IA + 2, enetaddr[2] | (enetaddr[3] << 8));
|
||||
put_reg(dev, PP_IA + 4, enetaddr[4] | (enetaddr[5] << 8));
|
||||
|
||||
eth_reginit ();
|
||||
cs8900_reginit(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Get a data block via Ethernet */
|
||||
int eth_rx (void)
|
||||
static int cs8900_recv(struct eth_device *dev)
|
||||
{
|
||||
int i;
|
||||
unsigned short rxlen;
|
||||
unsigned short *addr;
|
||||
unsigned short status;
|
||||
u16 rxlen;
|
||||
u16 *addr;
|
||||
u16 status;
|
||||
|
||||
status = get_reg (PP_RER);
|
||||
struct cs8900_priv *priv = (struct cs8900_priv *)(dev->priv);
|
||||
|
||||
status = get_reg(dev, PP_RER);
|
||||
|
||||
if ((status & PP_RER_RxOK) == 0)
|
||||
return 0;
|
||||
|
||||
status = CS8900_RTDATA; /* stat */
|
||||
rxlen = CS8900_RTDATA; /* len */
|
||||
status = REG_READ(&priv->regs->rtdata);
|
||||
rxlen = REG_READ(&priv->regs->rtdata);
|
||||
|
||||
#ifdef DEBUG
|
||||
if (rxlen > PKTSIZE_ALIGN + PKTALIGN)
|
||||
printf ("packet too big!\n");
|
||||
#endif
|
||||
for (addr = (unsigned short *) NetRxPackets[0], i = rxlen >> 1; i > 0;
|
||||
debug("packet too big!\n");
|
||||
for (addr = (u16 *) NetRxPackets[0], i = rxlen >> 1; i > 0;
|
||||
i--)
|
||||
*addr++ = CS8900_RTDATA;
|
||||
*addr++ = REG_READ(&priv->regs->rtdata);
|
||||
if (rxlen & 1)
|
||||
*addr++ = CS8900_RTDATA;
|
||||
*addr++ = REG_READ(&priv->regs->rtdata);
|
||||
|
||||
/* Pass the packet up to the protocol layers. */
|
||||
NetReceive (NetRxPackets[0], rxlen);
|
||||
|
||||
return rxlen;
|
||||
}
|
||||
|
||||
/* Send a data block via Ethernet. */
|
||||
int eth_send (volatile void *packet, int length)
|
||||
static int cs8900_send(struct eth_device *dev,
|
||||
volatile void *packet, int length)
|
||||
{
|
||||
volatile unsigned short *addr;
|
||||
volatile u16 *addr;
|
||||
int tmo;
|
||||
unsigned short s;
|
||||
u16 s;
|
||||
struct cs8900_priv *priv = (struct cs8900_priv *)(dev->priv);
|
||||
|
||||
retry:
|
||||
/* initiate a transmit sequence */
|
||||
CS8900_TxCMD = PP_TxCmd_TxStart_Full;
|
||||
CS8900_TxLEN = length;
|
||||
REG_WRITE(PP_TxCmd_TxStart_Full, &priv->regs->txcmd);
|
||||
REG_WRITE(length, &priv->regs->txlen);
|
||||
|
||||
/* Test to see if the chip has allocated memory for the packet */
|
||||
if ((get_reg (PP_BusSTAT) & PP_BusSTAT_TxRDY) == 0) {
|
||||
if ((get_reg(dev, PP_BusSTAT) & PP_BusSTAT_TxRDY) == 0) {
|
||||
/* Oops... this should not happen! */
|
||||
#ifdef DEBUG
|
||||
printf ("cs: unable to send packet; retrying...\n");
|
||||
#endif
|
||||
for (tmo = get_timer (0) + 5 * CONFIG_SYS_HZ; get_timer (0) < tmo;)
|
||||
debug("cs: unable to send packet; retrying...\n");
|
||||
for (tmo = get_timer(0) + 5 * CONFIG_SYS_HZ;
|
||||
get_timer(0) < tmo;)
|
||||
/*NOP*/;
|
||||
eth_reset ();
|
||||
eth_reginit ();
|
||||
cs8900_reset(dev);
|
||||
cs8900_reginit(dev);
|
||||
goto retry;
|
||||
}
|
||||
|
||||
/* Write the contents of the packet */
|
||||
/* assume even number of bytes */
|
||||
for (addr = packet; length > 0; length -= 2)
|
||||
CS8900_RTDATA = *addr++;
|
||||
REG_WRITE(*addr++, &priv->regs->rtdata);
|
||||
|
||||
/* wait for transfer to succeed */
|
||||
tmo = get_timer (0) + 5 * CONFIG_SYS_HZ;
|
||||
while ((s = get_reg (PP_TER) & ~0x1F) == 0) {
|
||||
if (get_timer (0) >= tmo)
|
||||
tmo = get_timer(0) + 5 * CONFIG_SYS_HZ;
|
||||
while ((s = get_reg(dev, PP_TER) & ~0x1F) == 0) {
|
||||
if (get_timer(0) >= tmo)
|
||||
break;
|
||||
}
|
||||
|
||||
/* nothing */ ;
|
||||
if ((s & (PP_TER_CRS | PP_TER_TxOK)) != PP_TER_TxOK) {
|
||||
#ifdef DEBUG
|
||||
printf ("\ntransmission error %#x\n", s);
|
||||
#endif
|
||||
if((s & (PP_TER_CRS | PP_TER_TxOK)) != PP_TER_TxOK) {
|
||||
debug("\ntransmission error %#x\n", s);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void cs8900_e2prom_ready(void)
|
||||
static void cs8900_e2prom_ready(struct eth_device *dev)
|
||||
{
|
||||
while (get_reg(PP_SelfSTAT) & SI_BUSY)
|
||||
while (get_reg(dev, PP_SelfSTAT) & SI_BUSY)
|
||||
;
|
||||
}
|
||||
|
||||
|
@ -259,12 +271,13 @@ static void cs8900_e2prom_ready(void)
|
|||
/* read a 16-bit word out of the EEPROM */
|
||||
/***********************************************************/
|
||||
|
||||
int cs8900_e2prom_read(unsigned char addr, unsigned short *value)
|
||||
int cs8900_e2prom_read(struct eth_device *dev,
|
||||
u8 addr, u16 *value)
|
||||
{
|
||||
cs8900_e2prom_ready();
|
||||
put_reg(PP_EECMD, EEPROM_READ_CMD | addr);
|
||||
cs8900_e2prom_ready();
|
||||
*value = get_reg(PP_EEData);
|
||||
cs8900_e2prom_ready(dev);
|
||||
put_reg(dev, PP_EECMD, EEPROM_READ_CMD | addr);
|
||||
cs8900_e2prom_ready(dev);
|
||||
*value = get_reg(dev, PP_EEData);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -274,16 +287,51 @@ int cs8900_e2prom_read(unsigned char addr, unsigned short *value)
|
|||
/* write a 16-bit word into the EEPROM */
|
||||
/***********************************************************/
|
||||
|
||||
int cs8900_e2prom_write(unsigned char addr, unsigned short value)
|
||||
int cs8900_e2prom_write(struct eth_device *dev, u8 addr, u16 value)
|
||||
{
|
||||
cs8900_e2prom_ready();
|
||||
put_reg(PP_EECMD, EEPROM_WRITE_EN);
|
||||
cs8900_e2prom_ready();
|
||||
put_reg(PP_EEData, value);
|
||||
put_reg(PP_EECMD, EEPROM_WRITE_CMD | addr);
|
||||
cs8900_e2prom_ready();
|
||||
put_reg(PP_EECMD, EEPROM_WRITE_DIS);
|
||||
cs8900_e2prom_ready();
|
||||
cs8900_e2prom_ready(dev);
|
||||
put_reg(dev, PP_EECMD, EEPROM_WRITE_EN);
|
||||
cs8900_e2prom_ready(dev);
|
||||
put_reg(dev, PP_EEData, value);
|
||||
put_reg(dev, PP_EECMD, EEPROM_WRITE_CMD | addr);
|
||||
cs8900_e2prom_ready(dev);
|
||||
put_reg(dev, PP_EECMD, EEPROM_WRITE_DIS);
|
||||
cs8900_e2prom_ready(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cs8900_initialize(u8 dev_num, int base_addr)
|
||||
{
|
||||
struct eth_device *dev;
|
||||
struct cs8900_priv *priv;
|
||||
|
||||
dev = malloc(sizeof(*dev));
|
||||
if (!dev) {
|
||||
free(dev);
|
||||
return 0;
|
||||
}
|
||||
memset(dev, 0, sizeof(*dev));
|
||||
|
||||
priv = malloc(sizeof(*priv));
|
||||
if (!priv) {
|
||||
free(priv);
|
||||
return 0;
|
||||
}
|
||||
memset(priv, 0, sizeof(*priv));
|
||||
priv->regs = (struct cs8900_regs *)base_addr;
|
||||
|
||||
/* Load MAC address from EEPROM */
|
||||
cs8900_get_enetaddr(dev);
|
||||
|
||||
dev->iobase = base_addr;
|
||||
dev->priv = priv;
|
||||
dev->init = cs8900_init;
|
||||
dev->halt = cs8900_halt;
|
||||
dev->send = cs8900_send;
|
||||
dev->recv = cs8900_recv;
|
||||
sprintf(dev->name, "%s-%hu", CS8900_DRIVERNAME, dev_num);
|
||||
|
||||
eth_register(dev);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
#ifndef CS8900_H
|
||||
#define CS8900_H
|
||||
/*
|
||||
* Cirrus Logic CS8900A Ethernet
|
||||
*
|
||||
* (C) 2009 Ben Warren , biggerbadderben@gmail.com
|
||||
* Converted to use CONFIG_NET_MULTI API
|
||||
*
|
||||
* (C) Copyright 2002
|
||||
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
|
||||
* Marius Groeger <mgroeger@sysgo.de>
|
||||
|
@ -35,33 +40,34 @@
|
|||
#include <asm/types.h>
|
||||
#include <config.h>
|
||||
|
||||
#ifdef CONFIG_DRIVER_CS8900
|
||||
|
||||
#define CS8900_DRIVERNAME "CS8900"
|
||||
/* although the registers are 16 bit, they are 32-bit aligned on the
|
||||
EDB7111. so we have to read them as 32-bit registers and ignore the
|
||||
upper 16-bits. i'm not sure if this holds for the EDB7211. */
|
||||
|
||||
#ifdef CS8900_BUS16
|
||||
#ifdef CONFIG_CS8900_BUS16
|
||||
/* 16 bit aligned registers, 16 bit wide */
|
||||
#define CS8900_REG u16
|
||||
#define CS8900_OFF 0x02
|
||||
#define CS8900_BUS16_0 *(volatile u8 *)(CS8900_BASE+0x00)
|
||||
#define CS8900_BUS16_1 *(volatile u8 *)(CS8900_BASE+0x01)
|
||||
#elif defined(CS8900_BUS32)
|
||||
#elif defined(CONFIG_CS8900_BUS32)
|
||||
/* 32 bit aligned registers, 16 bit wide (we ignore upper 16 bits) */
|
||||
#define CS8900_REG u32
|
||||
#define CS8900_OFF 0x04
|
||||
#else
|
||||
#error unknown bussize ...
|
||||
#endif
|
||||
|
||||
#define CS8900_RTDATA *(volatile CS8900_REG *)(CS8900_BASE+0x00*CS8900_OFF)
|
||||
#define CS8900_TxCMD *(volatile CS8900_REG *)(CS8900_BASE+0x02*CS8900_OFF)
|
||||
#define CS8900_TxLEN *(volatile CS8900_REG *)(CS8900_BASE+0x03*CS8900_OFF)
|
||||
#define CS8900_ISQ *(volatile CS8900_REG *)(CS8900_BASE+0x04*CS8900_OFF)
|
||||
#define CS8900_PPTR *(volatile CS8900_REG *)(CS8900_BASE+0x05*CS8900_OFF)
|
||||
#define CS8900_PDATA *(volatile CS8900_REG *)(CS8900_BASE+0x06*CS8900_OFF)
|
||||
struct cs8900_regs {
|
||||
CS8900_REG rtdata;
|
||||
CS8900_REG pad0;
|
||||
CS8900_REG txcmd;
|
||||
CS8900_REG txlen;
|
||||
CS8900_REG isq;
|
||||
CS8900_REG pptr;
|
||||
CS8900_REG pdata;
|
||||
};
|
||||
|
||||
struct cs8900_priv {
|
||||
struct cs8900_regs *regs;
|
||||
};
|
||||
|
||||
#define ISQ_RxEvent 0x04
|
||||
#define ISQ_TxEvent 0x08
|
||||
|
@ -251,7 +257,8 @@
|
|||
#define EEPROM_READ_CMD 0x0200
|
||||
#define EEPROM_ERASE_CMD 0x0300
|
||||
|
||||
extern int cs8900_e2prom_read(uchar, ushort *);
|
||||
extern int cs8900_e2prom_write(uchar, ushort);
|
||||
/* Exported functions */
|
||||
int cs8900_e2prom_read(struct eth_device *dev, uchar, ushort *);
|
||||
int cs8900_e2prom_write(struct eth_device *dev, uchar, ushort);
|
||||
|
||||
#endif /* CONFIG_DRIVER_CS8900 */
|
||||
#endif /* CS8900_H */
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include <net.h>
|
||||
#include <command.h>
|
||||
#include <tsec.h>
|
||||
#include <asm/errno.h>
|
||||
|
||||
#include "miiphy.h"
|
||||
|
||||
|
@ -380,6 +381,12 @@ uint mii_parse_sr(uint mii_reg, struct tsec_private * priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (ctrlc()) {
|
||||
puts("user interrupt!\n");
|
||||
priv->link = 0;
|
||||
return -EINTR;
|
||||
}
|
||||
|
||||
if ((i++ % 1000) == 0) {
|
||||
putc('.');
|
||||
}
|
||||
|
|
|
@ -426,15 +426,17 @@
|
|||
/********************************************/
|
||||
/* !!! CS8900 is __not__ tested on NIOS !!! */
|
||||
/********************************************/
|
||||
#define CONFIG_DRIVER_CS8900 /* Using CS8900 */
|
||||
#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* Using CS8900 */
|
||||
#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
|
||||
CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
|
||||
#if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
|
||||
#undef CS8900_BUS16
|
||||
#define CS8900_BUS32 1
|
||||
#undef CONFIG_CS8900_BUS16
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#else /* no */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
|
|
@ -232,15 +232,17 @@
|
|||
/********************************************/
|
||||
/* !!! CS8900 is __not__ tested on NIOS !!! */
|
||||
/********************************************/
|
||||
#define CONFIG_DRIVER_CS8900 /* Using CS8900 */
|
||||
#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* Using CS8900 */
|
||||
#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
|
||||
CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
|
||||
#if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
|
||||
#undef CS8900_BUS16
|
||||
#define CS8900_BUS32 1
|
||||
#undef CONFIG_CS8900_BUS16
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#else /* no */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
|
|
@ -249,15 +249,17 @@
|
|||
/********************************************/
|
||||
/* !!! CS8900 is __not__ tested on NIOS !!! */
|
||||
/********************************************/
|
||||
#define CONFIG_DRIVER_CS8900 /* Using CS8900 */
|
||||
#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* Using CS8900 */
|
||||
#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \
|
||||
CONFIG_SYS_NIOS_CPU_LAN0_OFFS)
|
||||
|
||||
#if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32)
|
||||
#undef CS8900_BUS16
|
||||
#define CS8900_BUS32 1
|
||||
#undef CONFIG_CS8900_BUS16
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#else /* no */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
|
|
@ -108,9 +108,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
#define CONFIG_DRIVER_S3C24X0_I2C 1 /* we use the buildin I2C controller */
|
||||
|
||||
|
|
|
@ -56,10 +56,11 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000300 /* armadillo board */
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000300 /* armadillo board */
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -150,9 +150,10 @@
|
|||
/*
|
||||
* Network chip
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1
|
||||
#define CS8900_BUS32 1
|
||||
#define CS8900_BASE 0x08000000
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900
|
||||
#define CONFIG_CS8900_BUS32
|
||||
#define CONFIG_CS8900_BASE 0x08000000
|
||||
|
||||
/*
|
||||
* Stack sizes
|
||||
|
|
|
@ -47,10 +47,11 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000000
|
||||
#define CS8900_BUS16 1
|
||||
#undef CS8900_BUS32
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000000
|
||||
#define CONFIG_CS8900_BUS16
|
||||
#undef CONFIG_CS8900_BUS32
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -47,9 +47,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20000000
|
||||
#define CS8900_BUS32 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20000000
|
||||
#define CONFIG_CS8900_BUS32
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -47,9 +47,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x20008300
|
||||
#define CS8900_BUS16 1
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x20008300
|
||||
#define CONFIG_CS8900_BUS16
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -66,9 +66,10 @@
|
|||
/*
|
||||
* CS8900 Ethernet drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x15000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x15000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -109,9 +109,10 @@
|
|||
"cp.b ${loadaddr} ${uboot_addr} ${filesize}; " \
|
||||
"setenv filesize; saveenv\0"
|
||||
|
||||
#define CONFIG_DRIVER_CS8900 1
|
||||
#define CS8900_BASE 0xb4020300
|
||||
#define CS8900_BUS16 1 /* follow the Linux driver */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900
|
||||
#define CONFIG_CS8900_BASE 0xb4020300
|
||||
#define CONFIG_CS8900_BUS16 1 /* follow the Linux driver */
|
||||
|
||||
/*
|
||||
* The MX31ADS board seems to have a hardware "peculiarity" confirmed under
|
||||
|
|
|
@ -138,6 +138,10 @@
|
|||
#define CONFIG_SMC_USE_32_BIT
|
||||
#define CONFIG_BOOTFILE "uImage"
|
||||
|
||||
#define CONFIG_IP_DEFRAG /* Allows faster download, TFTP and NFS */
|
||||
#define CONFIG_TFTP_BLOCKSIZE 4096
|
||||
#define CONFIG_NFS_READ_SIZE 4096
|
||||
|
||||
/* Storage information: onenand and nand */
|
||||
#define CONFIG_CMD_ONENAND
|
||||
#define CONFIG_MTD_ONENAND_VERIFY_WRITE
|
||||
|
|
|
@ -63,9 +63,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x19000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x19000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -56,9 +56,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -53,9 +53,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x19000300
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x19000300
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -74,9 +74,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x18800300
|
||||
#define CS8900_BUS16 1 /* follow the Linux driver */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x18800300
|
||||
#define CONFIG_CS8900_BUS16 /* follow the Linux driver */
|
||||
|
||||
/*
|
||||
* select serial console configuration
|
||||
|
|
|
@ -99,9 +99,10 @@
|
|||
/*
|
||||
* Hardware drivers
|
||||
*/
|
||||
#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */
|
||||
#define CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CS8900_BUS16 1 /* the Linux driver does accesses as shorts */
|
||||
#define CONFIG_NET_MULTI
|
||||
#define CONFIG_CS8900 /* we have a CS8900 on-board */
|
||||
#define CONFIG_CS8900_BASE 0x07000300 /* agrees with WIN CE PA */
|
||||
#define CONFIG_CS8900_BUS16 /* the Linux driver does accesses as shorts */
|
||||
|
||||
#define CONFIG_DRIVER_S3C24X0_I2C 1 /* we use the buildin I2C controller */
|
||||
|
||||
|
|
|
@ -43,6 +43,7 @@ int cpu_eth_init(bd_t *bis);
|
|||
/* Driver initialization prototypes */
|
||||
int au1x00_enet_initialize(bd_t*);
|
||||
int bfin_EMAC_initialize(bd_t *bis);
|
||||
int cs8900_initialize(u8 dev_num, int base_addr);
|
||||
int dc21x4x_initialize(bd_t *bis);
|
||||
int davinci_emac_initialize(void);
|
||||
int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr);
|
||||
|
|
|
@ -73,10 +73,6 @@ extern void dataflash_print_info(void);
|
|||
const char version_string[] =
|
||||
U_BOOT_VERSION" (" U_BOOT_DATE " - " U_BOOT_TIME ")"CONFIG_IDENT_STRING;
|
||||
|
||||
#ifdef CONFIG_DRIVER_CS8900
|
||||
extern void cs8900_get_enetaddr (void);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DRIVER_RTL8019
|
||||
extern void rtl8019_get_enetaddr (uchar * addr);
|
||||
#endif
|
||||
|
@ -423,11 +419,6 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DRIVER_CS8900
|
||||
/* XXX: this needs to be moved to board init */
|
||||
cs8900_get_enetaddr ();
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_DRIVER_SMC91111) || defined (CONFIG_DRIVER_LAN91C96)
|
||||
/* XXX: this needs to be moved to board init */
|
||||
if (getenv ("ethaddr")) {
|
||||
|
|
188
net/net.c
188
net/net.c
|
@ -1107,6 +1107,176 @@ static void CDPStart(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IP_DEFRAG
|
||||
/*
|
||||
* This function collects fragments in a single packet, according
|
||||
* to the algorithm in RFC815. It returns NULL or the pointer to
|
||||
* a complete packet, in static storage
|
||||
*/
|
||||
#ifndef CONFIG_NET_MAXDEFRAG
|
||||
#define CONFIG_NET_MAXDEFRAG 16384
|
||||
#endif
|
||||
/*
|
||||
* MAXDEFRAG, above, is chosen in the config file and is real data
|
||||
* so we need to add the NFS overhead, which is more than TFTP.
|
||||
* To use sizeof in the internal unnamed structures, we need a real
|
||||
* instance (can't do "sizeof(struct rpc_t.u.reply))", unfortunately).
|
||||
* The compiler doesn't complain nor allocates the actual structure
|
||||
*/
|
||||
static struct rpc_t rpc_specimen;
|
||||
#define IP_PKTSIZE (CONFIG_NET_MAXDEFRAG + sizeof(rpc_specimen.u.reply))
|
||||
|
||||
#define IP_MAXUDP (IP_PKTSIZE - IP_HDR_SIZE_NO_UDP)
|
||||
|
||||
/*
|
||||
* this is the packet being assembled, either data or frag control.
|
||||
* Fragments go by 8 bytes, so this union must be 8 bytes long
|
||||
*/
|
||||
struct hole {
|
||||
/* first_byte is address of this structure */
|
||||
u16 last_byte; /* last byte in this hole + 1 (begin of next hole) */
|
||||
u16 next_hole; /* index of next (in 8-b blocks), 0 == none */
|
||||
u16 prev_hole; /* index of prev, 0 == none */
|
||||
u16 unused;
|
||||
};
|
||||
|
||||
static IP_t *__NetDefragment(IP_t *ip, int *lenp)
|
||||
{
|
||||
static uchar pkt_buff[IP_PKTSIZE] __attribute__((aligned(PKTALIGN)));
|
||||
static u16 first_hole, total_len;
|
||||
struct hole *payload, *thisfrag, *h, *newh;
|
||||
IP_t *localip = (IP_t *)pkt_buff;
|
||||
uchar *indata = (uchar *)ip;
|
||||
int offset8, start, len, done = 0;
|
||||
u16 ip_off = ntohs(ip->ip_off);
|
||||
|
||||
/* payload starts after IP header, this fragment is in there */
|
||||
payload = (struct hole *)(pkt_buff + IP_HDR_SIZE_NO_UDP);
|
||||
offset8 = (ip_off & IP_OFFS);
|
||||
thisfrag = payload + offset8;
|
||||
start = offset8 * 8;
|
||||
len = ntohs(ip->ip_len) - IP_HDR_SIZE_NO_UDP;
|
||||
|
||||
if (start + len > IP_MAXUDP) /* fragment extends too far */
|
||||
return NULL;
|
||||
|
||||
if (!total_len || localip->ip_id != ip->ip_id) {
|
||||
/* new (or different) packet, reset structs */
|
||||
total_len = 0xffff;
|
||||
payload[0].last_byte = ~0;
|
||||
payload[0].next_hole = 0;
|
||||
payload[0].prev_hole = 0;
|
||||
first_hole = 0;
|
||||
/* any IP header will work, copy the first we received */
|
||||
memcpy(localip, ip, IP_HDR_SIZE_NO_UDP);
|
||||
}
|
||||
|
||||
/*
|
||||
* What follows is the reassembly algorithm. We use the payload
|
||||
* array as a linked list of hole descriptors, as each hole starts
|
||||
* at a multiple of 8 bytes. However, last byte can be whatever value,
|
||||
* so it is represented as byte count, not as 8-byte blocks.
|
||||
*/
|
||||
|
||||
h = payload + first_hole;
|
||||
while (h->last_byte < start) {
|
||||
if (!h->next_hole) {
|
||||
/* no hole that far away */
|
||||
return NULL;
|
||||
}
|
||||
h = payload + h->next_hole;
|
||||
}
|
||||
|
||||
if (offset8 + (len / 8) <= h - payload) {
|
||||
/* no overlap with holes (dup fragment?) */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!(ip_off & IP_FLAGS_MFRAG)) {
|
||||
/* no more fragmentss: truncate this (last) hole */
|
||||
total_len = start + len;
|
||||
h->last_byte = start + len;
|
||||
}
|
||||
|
||||
/*
|
||||
* There is some overlap: fix the hole list. This code doesn't
|
||||
* deal with a fragment that overlaps with two different holes
|
||||
* (thus being a superset of a previously-received fragment).
|
||||
*/
|
||||
|
||||
if ( (h >= thisfrag) && (h->last_byte <= start + len) ) {
|
||||
/* complete overlap with hole: remove hole */
|
||||
if (!h->prev_hole && !h->next_hole) {
|
||||
/* last remaining hole */
|
||||
done = 1;
|
||||
} else if (!h->prev_hole) {
|
||||
/* first hole */
|
||||
first_hole = h->next_hole;
|
||||
payload[h->next_hole].prev_hole = 0;
|
||||
} else if (!h->next_hole) {
|
||||
/* last hole */
|
||||
payload[h->prev_hole].next_hole = 0;
|
||||
} else {
|
||||
/* in the middle of the list */
|
||||
payload[h->next_hole].prev_hole = h->prev_hole;
|
||||
payload[h->prev_hole].next_hole = h->next_hole;
|
||||
}
|
||||
|
||||
} else if (h->last_byte <= start + len) {
|
||||
/* overlaps with final part of the hole: shorten this hole */
|
||||
h->last_byte = start;
|
||||
|
||||
} else if (h >= thisfrag) {
|
||||
/* overlaps with initial part of the hole: move this hole */
|
||||
newh = thisfrag + (len / 8);
|
||||
*newh = *h;
|
||||
h = newh;
|
||||
if (h->next_hole)
|
||||
payload[h->next_hole].prev_hole = (h - payload);
|
||||
if (h->prev_hole)
|
||||
payload[h->prev_hole].next_hole = (h - payload);
|
||||
else
|
||||
first_hole = (h - payload);
|
||||
|
||||
} else {
|
||||
/* fragment sits in the middle: split the hole */
|
||||
newh = thisfrag + (len / 8);
|
||||
*newh = *h;
|
||||
h->last_byte = start;
|
||||
h->next_hole = (newh - payload);
|
||||
newh->prev_hole = (h - payload);
|
||||
if (newh->next_hole)
|
||||
payload[newh->next_hole].prev_hole = (newh - payload);
|
||||
}
|
||||
|
||||
/* finally copy this fragment and possibly return whole packet */
|
||||
memcpy((uchar *)thisfrag, indata + IP_HDR_SIZE_NO_UDP, len);
|
||||
if (!done)
|
||||
return NULL;
|
||||
|
||||
localip->ip_len = htons(total_len);
|
||||
*lenp = total_len + IP_HDR_SIZE_NO_UDP;
|
||||
return localip;
|
||||
}
|
||||
|
||||
static inline IP_t *NetDefragment(IP_t *ip, int *lenp)
|
||||
{
|
||||
u16 ip_off = ntohs(ip->ip_off);
|
||||
if (!(ip_off & (IP_OFFS | IP_FLAGS_MFRAG)))
|
||||
return ip; /* not a fragment */
|
||||
return __NetDefragment(ip, lenp);
|
||||
}
|
||||
|
||||
#else /* !CONFIG_IP_DEFRAG */
|
||||
|
||||
static inline IP_t *NetDefragment(IP_t *ip, int *lenp)
|
||||
{
|
||||
u16 ip_off = ntohs(ip->ip_off);
|
||||
if (!(ip_off & (IP_OFFS | IP_FLAGS_MFRAG)))
|
||||
return ip; /* not a fragment */
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
NetReceive(volatile uchar * inpkt, int len)
|
||||
|
@ -1333,10 +1503,12 @@ NetReceive(volatile uchar * inpkt, int len)
|
|||
|
||||
case PROT_IP:
|
||||
debug("Got IP\n");
|
||||
/* Before we start poking the header, make sure it is there */
|
||||
if (len < IP_HDR_SIZE) {
|
||||
debug("len bad %d < %lu\n", len, (ulong)IP_HDR_SIZE);
|
||||
return;
|
||||
}
|
||||
/* Check the packet length */
|
||||
if (len < ntohs(ip->ip_len)) {
|
||||
printf("len bad %d < %d\n", len, ntohs(ip->ip_len));
|
||||
return;
|
||||
|
@ -1344,21 +1516,20 @@ NetReceive(volatile uchar * inpkt, int len)
|
|||
len = ntohs(ip->ip_len);
|
||||
debug("len=%d, v=%02x\n", len, ip->ip_hl_v & 0xff);
|
||||
|
||||
/* Can't deal with anything except IPv4 */
|
||||
if ((ip->ip_hl_v & 0xf0) != 0x40) {
|
||||
return;
|
||||
}
|
||||
/* Can't deal with fragments */
|
||||
if (ip->ip_off & htons(IP_OFFS | IP_FLAGS_MFRAG)) {
|
||||
return;
|
||||
}
|
||||
/* can't deal with headers > 20 bytes */
|
||||
/* Can't deal with IP options (headers != 20 bytes) */
|
||||
if ((ip->ip_hl_v & 0x0f) > 0x05) {
|
||||
return;
|
||||
}
|
||||
/* Check the Checksum of the header */
|
||||
if (!NetCksumOk((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2)) {
|
||||
puts ("checksum bad\n");
|
||||
return;
|
||||
}
|
||||
/* If it is not for us, ignore it */
|
||||
tmp = NetReadIP(&ip->ip_dst);
|
||||
if (NetOurIP && tmp != NetOurIP && tmp != 0xFFFFFFFF) {
|
||||
#ifdef CONFIG_MCAST_TFTP
|
||||
|
@ -1366,6 +1537,13 @@ NetReceive(volatile uchar * inpkt, int len)
|
|||
#endif
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* The function returns the unchanged packet if it's not
|
||||
* a fragment, and either the complete packet or NULL if
|
||||
* it is a fragment (if !CONFIG_IP_DEFRAG, it returns NULL)
|
||||
*/
|
||||
if (!(ip = NetDefragment(ip, &len)))
|
||||
return;
|
||||
/*
|
||||
* watch for ICMP host redirects
|
||||
*
|
||||
|
|
10
net/nfs.h
10
net/nfs.h
|
@ -38,8 +38,14 @@
|
|||
|
||||
/* Block size used for NFS read accesses. A RPC reply packet (including all
|
||||
* headers) must fit within a single Ethernet frame to avoid fragmentation.
|
||||
* Chosen to be a power of two, as most NFS servers are optimized for this. */
|
||||
#define NFS_READ_SIZE 1024
|
||||
* However, if CONFIG_IP_DEFRAG is set, the config file may want to use a
|
||||
* bigger value. In any 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 */
|
||||
#endif
|
||||
|
||||
#define NFS_MAXLINKDEPTH 16
|
||||
|
||||
|
|
51
net/tftp.c
51
net/tftp.c
|
@ -56,6 +56,10 @@ static ulong TftpLastBlock; /* last packet sequence number received */
|
|||
static ulong TftpBlockWrap; /* count of sequence number wraparounds */
|
||||
static ulong TftpBlockWrapOffset; /* memory offset due to wrapping */
|
||||
static int TftpState;
|
||||
#ifdef CONFIG_TFTP_TSIZE
|
||||
static int TftpTsize; /* The file size reported by the server */
|
||||
static short TftpNumchars; /* The number of hashes we printed */
|
||||
#endif
|
||||
|
||||
#define STATE_RRQ 1
|
||||
#define STATE_DATA 2
|
||||
|
@ -84,8 +88,14 @@ extern flash_info_t flash_info[];
|
|||
/* 512 is poor choice for ethernet, MTU is typically 1500.
|
||||
* Minus eth.hdrs thats 1468. Can get 2x better throughput with
|
||||
* almost-MTU block sizes. At least try... fall back to 512 if need be.
|
||||
* (but those using CONFIG_IP_DEFRAG may want to set a larger block in cfg file)
|
||||
*/
|
||||
#ifdef CONFIG_TFTP_BLOCKSIZE
|
||||
#define TFTP_MTU_BLOCKSIZE CONFIG_TFTP_BLOCKSIZE
|
||||
#else
|
||||
#define TFTP_MTU_BLOCKSIZE 1468
|
||||
#endif
|
||||
|
||||
static unsigned short TftpBlkSize=TFTP_BLOCK_SIZE;
|
||||
static unsigned short TftpBlkSizeOption=TFTP_MTU_BLOCKSIZE;
|
||||
|
||||
|
@ -196,6 +206,10 @@ TftpSend (void)
|
|||
sprintf((char *)pkt, "%lu", TIMEOUT / 1000);
|
||||
debug("send option \"timeout %s\"\n", (char *)pkt);
|
||||
pkt += strlen((char *)pkt) + 1;
|
||||
#ifdef CONFIG_TFTP_TSIZE
|
||||
memcpy((char *)pkt, "tsize\0000\0", 8);
|
||||
pkt += 8;
|
||||
#endif
|
||||
/* try for more effic. blk size */
|
||||
pkt += sprintf((char *)pkt,"blksize%c%d%c",
|
||||
0,TftpBlkSizeOption,0);
|
||||
|
@ -307,8 +321,14 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
|
|||
simple_strtoul((char*)pkt+i+8,NULL,10);
|
||||
debug("Blocksize ack: %s, %d\n",
|
||||
(char*)pkt+i+8,TftpBlkSize);
|
||||
break;
|
||||
}
|
||||
#ifdef CONFIG_TFTP_TSIZE
|
||||
if (strcmp ((char*)pkt+i,"tsize") == 0) {
|
||||
TftpTsize = simple_strtoul((char*)pkt+i+6,NULL,10);
|
||||
debug("size = %s, %d\n",
|
||||
(char*)pkt+i+6, TftpTsize);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef CONFIG_MCAST_TFTP
|
||||
parse_multicast_oack((char *)pkt,len-1);
|
||||
|
@ -334,7 +354,16 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
|
|||
TftpBlockWrap++;
|
||||
TftpBlockWrapOffset += TftpBlkSize * TFTP_SEQUENCE_SIZE;
|
||||
printf ("\n\t %lu MB received\n\t ", TftpBlockWrapOffset>>20);
|
||||
} else {
|
||||
}
|
||||
#ifdef CONFIG_TFTP_TSIZE
|
||||
else if (TftpTsize) {
|
||||
while (TftpNumchars < NetBootFileXferSize * 50 / TftpTsize) {
|
||||
putc('#');
|
||||
TftpNumchars++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
if (((TftpBlock - 1) % 10) == 0) {
|
||||
putc ('#');
|
||||
} else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) {
|
||||
|
@ -428,6 +457,13 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
|
|||
* We received the whole thing. Try to
|
||||
* run it.
|
||||
*/
|
||||
#ifdef CONFIG_TFTP_TSIZE
|
||||
/* Print out the hash marks for the last packet received */
|
||||
while (TftpTsize && TftpNumchars < 49) {
|
||||
putc('#');
|
||||
TftpNumchars++;
|
||||
}
|
||||
#endif
|
||||
puts ("\ndone\n");
|
||||
NetState = NETLOOP_SUCCESS;
|
||||
}
|
||||
|
@ -466,9 +502,12 @@ TftpTimeout (void)
|
|||
void
|
||||
TftpStart (void)
|
||||
{
|
||||
#ifdef CONFIG_TFTP_PORT
|
||||
char *ep; /* Environment pointer */
|
||||
#endif
|
||||
|
||||
/* Allow the user to choose tftpblocksize */
|
||||
if ((ep = getenv("tftpblocksize")) != NULL)
|
||||
TftpBlkSizeOption = simple_strtol(ep, NULL, 10);
|
||||
debug("tftp block size is %i\n", TftpBlkSizeOption);
|
||||
|
||||
TftpServerIP = NetServerIP;
|
||||
if (BootFile[0] == '\0') {
|
||||
|
@ -554,6 +593,10 @@ TftpStart (void)
|
|||
#ifdef CONFIG_MCAST_TFTP
|
||||
mcast_cleanup();
|
||||
#endif
|
||||
#ifdef CONFIG_TFTP_TSIZE
|
||||
TftpTsize = 0;
|
||||
TftpNumchars = 0;
|
||||
#endif
|
||||
|
||||
TftpSend ();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue