From: Hauke Mehrtens Date: Wed, 13 Mar 2024 19:02:01 +0000 (+0100) Subject: kernel: kmod-can: Fix build of can drivers X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fcf045354918acbbd9665f28f334defab1f545fa;p=openwrt%2Fstaging%2Fnbd.git kernel: kmod-can: Fix build of can drivers Many can kernel modules are now gated by the newly introduced CONFIG_CAN_NETLINK configuration option. Activate it to build the can drivers again. This was changed in this upstream Linux commit: https://git.kernel.org/linus/df6ad5dd838e0fa543ca28ca6154901fa65a9443 This should fix these warnings with kernel 6.1 and 6.6: logs/package/kernel/linux/compile.txt:WARNING: kmod-can-c-can is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-c-can-pci is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-c-can-platform is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-mcp251x is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-slcan is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-usb-8dev is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-usb-ems is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-usb-kvaser is not available in the kernel config - generating empty package logs/package/kernel/linux/compile.txt:WARNING: kmod-can-usb-peak is not available in the kernel config - generating empty package Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index 2175d0d565..eda9b0c487 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -13,6 +13,7 @@ define KernelPackage/can KCONFIG:=\ CONFIG_CAN=m \ CONFIG_CAN_DEV \ + CONFIG_CAN_NETLINK=y \ CONFIG_CAN_CALC_BITTIMING=y \ CONFIG_CAN_LEDS=y \ CONFIG_CAN_AT91=n \ diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index 3cb50bc274..d544ab9c4c 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -898,6 +898,7 @@ CONFIG_CACHE_L2X0_PMU=y # CONFIG_CAN_DEV is not set # CONFIG_CAN_ESD_USB is not set # CONFIG_CAN_ETAS_ES58X is not set +# CONFIG_CAN_F81604 is not set # CONFIG_CAN_GS_USB is not set # CONFIG_CAN_GW is not set # CONFIG_CAN_HI311X is not set