diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:11:07 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-05-14 07:11:07 +0200 |
| commit | 36acabd5c522501bd7da8eb7a21c865fc78676ee (patch) | |
| tree | 222a1c7fcf1aaa1dea016af22ae1aae451f41f50 /drivers/net | |
| parent | cc31adf78d10eb1a5880ef51e240ab4273315e4b (diff) | |
| parent | 18b7b5448c78bd351b1e795984b08bea3822a1e2 (diff) | |
| download | barebox-36acabd5c522501bd7da8eb7a21c865fc78676ee.tar.gz barebox-36acabd5c522501bd7da8eb7a21c865fc78676ee.tar.xz | |
Merge branch 'for-next/kconfig'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/net/enc28j60.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d202d76729..9bb4985275 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -7,9 +7,6 @@ config HAS_AT91_ETHER config HAS_CS8900 bool -config HAS_DESIGNWARE_ETH - bool - config HAS_DM9000 bool diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 3628a88f7d..b3cfb65c1c 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -273,7 +273,7 @@ static void enc28j60_mem_read(struct enc28j60_net *priv, { enc28j60_regw_write(priv, ERDPTL, addr); - if (IS_ENABLED(CONFIG_ENC28J60_WRITEVERIFY)) { + if (IS_ENABLED(CONFIG_DRIVER_NET_ENC28J60_WRITEVERIFY)) { u16 reg; reg = enc28j60_regw_read(priv, ERDPTL); if (reg != addr) @@ -293,7 +293,7 @@ enc28j60_packet_write(struct enc28j60_net *priv, int len, const u8 *data) /* Set the write pointer to start of transmit buffer area */ enc28j60_regw_write(priv, EWRPTL, TXSTART_INIT); - if (IS_ENABLED(CONFIG_ENC28J60_WRITEVERIFY)) { + if (IS_ENABLED(CONFIG_DRIVER_NET_ENC28J60_WRITEVERIFY)) { u16 reg; reg = enc28j60_regw_read(priv, EWRPTL); if (reg != TXSTART_INIT) @@ -710,7 +710,7 @@ static int enc28j60_eth_send(struct eth_device *edev, void *packet, enc28j60_packet_write(priv, packet_length, packet); /* readback and verify written data */ - if (IS_ENABLED(CONFIG_ENC28J60_WRITEVERIFY)) { + if (IS_ENABLED(CONFIG_DRIVER_NET_ENC28J60_WRITEVERIFY)) { int test_len, k; u8 test_buf[64]; /* limit the test to the first 64 bytes */ int okflag; @@ -808,7 +808,7 @@ static void enc28j60_hw_rx(struct eth_device *edev) enc28j60_regw_write(priv, ERXRDPTL, erxrdpt); - if (IS_ENABLED(CONFIG_ENC28J60_WRITEVERIFY)) { + if (IS_ENABLED(CONFIG_DRIVER_NET_ENC28J60_WRITEVERIFY)) { u16 reg; reg = enc28j60_regw_read(priv, ERXRDPTL); if (reg != erxrdpt) |