提交 b92b8f48 编写于 作者: M Marek Vasut 提交者: Daniel Schwierzeck

net: pcnet: Drop PCNET_HAS_PROM

All of one PCNET users has this option set, make this default
and drop this config option.
Signed-off-by: NMarek Vasut <marek.vasut+renesas@gmail.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
上级 b9c52c50
...@@ -241,10 +241,7 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr) ...@@ -241,10 +241,7 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
{ {
int chip_version; int chip_version;
char *chipname; char *chipname;
#ifdef PCNET_HAS_PROM
int i; int i;
#endif
/* Reset the PCnet controller */ /* Reset the PCnet controller */
pcnet_reset(dev); pcnet_reset(dev);
...@@ -279,7 +276,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr) ...@@ -279,7 +276,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
PCNET_DEBUG1("AMD %s\n", chipname); PCNET_DEBUG1("AMD %s\n", chipname);
#ifdef PCNET_HAS_PROM
/* /*
* In most chips, after a chip reset, the ethernet address is read from * In most chips, after a chip reset, the ethernet address is read from
* the station address PROM at the base address and programmed into the * the station address PROM at the base address and programmed into the
...@@ -293,7 +289,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr) ...@@ -293,7 +289,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
dev->enetaddr[2 * i] = val & 0x0ff; dev->enetaddr[2 * i] = val & 0x0ff;
dev->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff; dev->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff;
} }
#endif /* PCNET_HAS_PROM */
return 0; return 0;
} }
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define CONFIG_PCI_GT64120 #define CONFIG_PCI_GT64120
#define CONFIG_PCI_MSC01 #define CONFIG_PCI_MSC01
#define CONFIG_PCNET #define CONFIG_PCNET
#define PCNET_HAS_PROM
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册