aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTan Zien <nabsdh9@gmail.com>2020-04-04 12:02:40 +0800
committerDavid Bauer <mail@david-bauer.net>2020-04-04 17:12:43 +0200
commitd24e43a7f622a8033f3703027fb19a617ae7aa02 (patch)
tree0a70d0d72b72389e3cde427e9ff313b87849a977
parent02640f014719a994e2e538b2cb6376a189cd39de (diff)
downloadupstream-d24e43a7f622a8033f3703027fb19a617ae7aa02.tar.gz
upstream-d24e43a7f622a8033f3703027fb19a617ae7aa02.tar.bz2
upstream-d24e43a7f622a8033f3703027fb19a617ae7aa02.zip
kernel: Fix miss config and module for mlx driver
Missing config symbols could lead to build failures on kernel 4.14/4.19. Signed-off-by: Tan Zien <nabsdh9@gmail.com> [rephrase commit message - reorder symbols] Signed-off-by: David Bauer <mail@david-bauer.net>
-rw-r--r--package/kernel/linux/modules/netdevices.mk13
1 files changed, 10 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 34503f1e83..28f7648efe 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -1095,12 +1095,15 @@ define KernelPackage/mlx4-core
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Mellanox ConnectX(R) mlx4 core Network Driver
DEPENDS:=@PCI_SUPPORT +kmod-ptp
- FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
+ FILES:= \
+ $(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko \
+ $(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko
KCONFIG:= CONFIG_MLX4_EN \
+ CONFIG_MLX4_EN_DCB=n \
CONFIG_MLX4_CORE=y \
CONFIG_MLX4_CORE_GEN2=y \
CONFIG_MLX4_DEBUG=n
- AUTOLOAD:=$(call AutoProbe,mlx4_core)
+ AUTOLOAD:=$(call AutoProbe,mlx4_core mlx4_en)
endef
define KernelPackage/mlx4-core/description
@@ -1116,7 +1119,11 @@ define KernelPackage/mlx5-core
FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
KCONFIG:= CONFIG_MLX5_CORE \
CONFIG_MLX5_CORE_EN=y \
- CONFIG_MLX5_EN_RXNFC=y
+ CONFIG_MLX5_EN_RXNFC=y \
+ CONFIG_MLX5_FPGA=n \
+ CONFIG_MLX5_MPFS=n \
+ CONFIG_MLX5_EN_ARFS=n \
+ CONFIG_MLX5_CORE_IPOIB=n
AUTOLOAD:=$(call AutoProbe,mlx5_core)
endef