colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: pcnet: Drop PCNET_HAS_PROM

Browse Source 
All of one PCNET users has this option set, make this default
and drop this config option.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Marek Vasut
2020-05-17 18:12:19 +02:00
parent 97d5c14559
commit 1524e409ef
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/pcnet.c
View File

@@ -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)
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)
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;
} }

1
include/configs/malta.h
View File

@@ -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