diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2020-04-18 01:44:12 +0200 |
|---|---|---|
| committer | marex <marex@desktop.lan> | 2020-05-01 12:35:20 +0200 |
| commit | 635a76b703f3bd5b20e28bfc86caee9889f536c2 (patch) | |
| tree | fe16ce90fff13a127cfabf9d22e586032ac4926f | |
| parent | f2c5564f7552369e2d5648eb8ac2e1164755c8f7 (diff) | |
| download | u-boot-635a76b703f3bd5b20e28bfc86caee9889f536c2.zip u-boot-635a76b703f3bd5b20e28bfc86caee9889f536c2.tar.gz u-boot-635a76b703f3bd5b20e28bfc86caee9889f536c2.tar.bz2 | |
net: pcnet: Remove CONFIG_PCNET_79C97x
These macros guard one switch-case statement, which grows mips malta
by some 20 bytes if debug is enabled, and even less if it is not. To
make the code simpler, just support all the NICs and be done with it.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | drivers/net/pcnet.c | 8 | ||||
| -rw-r--r-- | include/configs/malta.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index b4ad11d..59241c9 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -21,10 +21,6 @@ #define PCNET_DEBUG2(fmt,args...) \ debug_cond(PCNET_DEBUG_LEVEL > 1, fmt ,##args) -#if !defined(CONF_PCNET_79C973) && defined(CONF_PCNET_79C975) -#error "Macro for PCnet chip version is not defined!" -#endif - /* * Set the number of Tx and Rx buffers, using Log_2(# buffers). * Reasonable default values are 4 Tx buffers, and 16 Rx buffers. @@ -254,16 +250,12 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr) case 0x2621: chipname = "PCnet/PCI II 79C970A"; /* PCI */ break; -#ifdef CONFIG_PCNET_79C973 case 0x2625: chipname = "PCnet/FAST III 79C973"; /* PCI */ break; -#endif -#ifdef CONFIG_PCNET_79C975 case 0x2627: chipname = "PCnet/FAST III 79C975"; /* PCI */ break; -#endif default: printf("%s: PCnet version %#x not supported\n", dev->name, chip_version); diff --git a/include/configs/malta.h b/include/configs/malta.h index bb8a444..d41b80c 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -16,7 +16,6 @@ #define CONFIG_PCI_GT64120 #define CONFIG_PCI_MSC01 #define CONFIG_PCNET -#define CONFIG_PCNET_79C973 #define PCNET_HAS_PROM #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 12a6698..27125d7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1292,8 +1292,6 @@ CONFIG_PCI_SYS_BUS CONFIG_PCI_SYS_PHYS CONFIG_PCI_SYS_SIZE CONFIG_PCNET -CONFIG_PCNET_79C973 -CONFIG_PCNET_79C975 CONFIG_PEN_ADDR_BIG_ENDIAN CONFIG_PERIF1_FREQ CONFIG_PERIF2_FREQ |