All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH 02/15] net: pcnet: Drop PCNET_HAS_PROM
Date: Sun, 17 May 2020 18:24:12 +0200	[thread overview]
Message-ID: <20200517162425.76584-2-marek.vasut+renesas@gmail.com> (raw)
In-Reply-To: <20200517162425.76584-1-marek.vasut+renesas@gmail.com>

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>
---
 drivers/net/pcnet.c     | 5 -----
 include/configs/malta.h | 1 -
 2 files changed, 6 deletions(-)

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index f34fc4abbf..15d102d3a9 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -238,10 +238,7 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 {
 	int chip_version;
 	char *chipname;
-
-#ifdef PCNET_HAS_PROM
 	int i;
-#endif
 
 	/* Reset the PCnet controller */
 	pcnet_reset(dev);
@@ -276,7 +273,6 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 
 	PCNET_DEBUG1("AMD %s\n", chipname);
 
-#ifdef PCNET_HAS_PROM
 	/*
 	 * 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
@@ -290,7 +286,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 + 1] = (val >> 8) & 0x0ff;
 	}
-#endif /* PCNET_HAS_PROM */
 
 	return 0;
 }
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 773d7c23ed..82c90042d9 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 PCNET_HAS_PROM
 
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS	0
 
-- 
2.25.1

  reply	other threads:[~2020-05-17 16:24 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-17 16:24 [PATCH 01/15] net: pcnet: Drop typedef struct pcnet_priv_t Marek Vasut
2020-05-17 16:24 ` Marek Vasut [this message]
2020-05-17 16:24 ` [PATCH 03/15] net: pcnet: Use PCI_DEVICE() to define PCI device compat list Marek Vasut
2020-05-17 16:24 ` [PATCH 04/15] net: pcnet: Simplify private data allocation Marek Vasut
2020-05-17 16:24 ` [PATCH 05/15] net: pcnet: Replace memset+malloc with calloc Marek Vasut
2020-05-17 16:24 ` [PATCH 06/15] net: pcnet: Move private data allocation to initialize Marek Vasut
2020-05-17 16:24 ` [PATCH 07/15] net: pcnet: Move initialize function at the end Marek Vasut
2020-05-17 16:24 ` [PATCH 08/15] net: pcnet: Drop useless forward declarations Marek Vasut
2020-05-17 16:24 ` [PATCH 09/15] net: pcnet: Wrap devbusfn into private data Marek Vasut
2020-05-17 16:24 ` [PATCH 10/15] net: pcnet: Pass private data through dev->priv Marek Vasut
2020-05-17 16:24 ` [PATCH 11/15] net: pcnet: Wrap iobase into private data Marek Vasut
2020-05-17 16:24 ` [PATCH 12/15] net: pcnet: Wrap name and enetaddr " Marek Vasut
2020-05-17 16:24 ` [PATCH 13/15] net: pcnet: Split common and non-DM functions Marek Vasut
2020-05-17 16:24 ` [PATCH 14/15] net: pcnet: Add DM support Marek Vasut
2020-05-17 16:24 ` [PATCH 15/15] net: pcnet: Add Kconfig entries Marek Vasut
2020-05-18  9:18   ` Daniel Schwierzeck
2020-05-18  9:54     ` Marek Vasut
2020-05-18 16:03       ` Daniel Schwierzeck
2020-06-05 15:28 ` [PATCH 01/15] net: pcnet: Drop typedef struct pcnet_priv_t Daniel Schwierzeck
2020-06-05 16:22   ` Marek Vasut
2020-06-05 16:38     ` Daniel Schwierzeck
2020-06-05 17:50       ` Marek Vasut
2020-06-05 23:56         ` Daniel Schwierzeck
2020-06-06 12:00           ` Marek Vasut

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200517162425.76584-2-marek.vasut+renesas@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.