Kconfig claims that the ixp4xx-qmgr and ixp4xx-npe helper drivers
are selected automatically as needed. However this is not what the
Kconfig entries are doing. Convert depends to select to match the
help texts.
Signed-off-by: Jean Delvare <jdelv...@suse.de>
Cc: Krzysztof Halasa <khal...@piap.pl>
---
drivers/crypto/Kconfig | 4 +++-
drivers/net/ethernet/xscale/Kconfig | 7 ++++---
drivers/net/wan/Kconfig | 4 +++-
3 files changed, 10 insertions(+), 5 deletions(-)
--- linux-5.7.orig/drivers/net/ethernet/xscale/Kconfig 2020-06-01
01:49:15.000000000 +0200
+++ linux-5.7/drivers/net/ethernet/xscale/Kconfig 2020-06-23
13:05:23.071767146 +0200
@@ -6,8 +6,7 @@
config NET_VENDOR_XSCALE
bool "Intel XScale IXP devices"
default y
- depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX && \
- IXP4XX_NPE && IXP4XX_QMGR)
+ depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX)
---help---
If you have a network (Ethernet) card belonging to this class, say Y.
@@ -20,9 +19,11 @@ if NET_VENDOR_XSCALE
config IXP4XX_ETH
tristate "Intel IXP4xx Ethernet support"
- depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+ depends on ARM && ARCH_IXP4XX
select PHYLIB
select NET_PTP_CLASSIFY
+ select IXP4XX_NPE
+ select IXP4XX_QMGR
---help---
Say Y here if you want to use built-in Ethernet ports
on IXP4xx processor.
--- linux-5.7.orig/drivers/net/wan/Kconfig 2020-06-01 01:49:15.000000000
+0200
+++ linux-5.7/drivers/net/wan/Kconfig 2020-06-23 13:05:23.072767157 +0200
@@ -315,8 +315,10 @@ config DSCC4_PCI_RST
config IXP4XX_HSS
tristate "Intel IXP4xx HSS (synchronous serial port) support"
- depends on HDLC && IXP4XX_NPE && IXP4XX_QMGR
+ depends on HDLC
depends on ARCH_IXP4XX
+ select IXP4XX_NPE
+ select IXP4XX_QMGR
help
Say Y here if you want to use built-in HSS ports
on IXP4xx processor.
--- linux-5.7.orig/drivers/crypto/Kconfig 2020-06-01 01:49:15.000000000
+0200
+++ linux-5.7/drivers/crypto/Kconfig 2020-06-25 00:04:11.570461001 +0200
@@ -308,11 +308,13 @@ config CRYPTO_DEV_TALITOS2
config CRYPTO_DEV_IXP4XX
tristate "Driver for IXP4xx crypto hardware acceleration"
- depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
+ depends on ARCH_IXP4XX
select CRYPTO_LIB_DES
select CRYPTO_AEAD
select CRYPTO_AUTHENC
select CRYPTO_SKCIPHER
+ select IXP4XX_NPE
+ select IXP4XX_QMGR
help
Driver for the IXP4xx NPE crypto engine.
--
Jean Delvare
SUSE L3 Support
