From 452b35cf4eb761fedf6a486a0e97c78f0f13a4e4 Mon Sep 17 00:00:00 2001 From: Sander van Deijck Date: Sun, 18 Oct 2026 18:32:30 +0200 Subject: [PATCH] kernel: drop stale KCONFIG symbols from kmod definitions Remove KCONFIG symbols that no longer exist in kernel 6.18 from the kmod definitions. Some were renamed and the new symbol is already listed in the same package (e.g. CRYPTO_GF128MUL -> CRYPTO_LIB_GF128MUL, USB_YEALINK -> INPUT_YEALINK, MEDIA_RC_SUPPORT -> RC_CORE). The others belong to options and drivers that were removed upstream (e.g. CAN_LEDS, E1000_NAPI, NF_FLOW_TABLE_HW, the Keyspan firmware options). The generated package metadata is unchanged apart from the Kernel-Config field of the affected packages. Signed-off-by: Sander van Deijck Link: https://github.com/openwrt/openwrt/pull/25965 Signed-off-by: Robert Marko --- package/kernel/linux/modules/block.mk | 16 ++++------ package/kernel/linux/modules/can.mk | 3 -- package/kernel/linux/modules/crypto.mk | 1 - package/kernel/linux/modules/firewire.mk | 4 +-- package/kernel/linux/modules/iio.mk | 1 - package/kernel/linux/modules/netdevices.mk | 15 ++-------- package/kernel/linux/modules/netfilter.mk | 3 +- package/kernel/linux/modules/netsupport.mk | 4 +-- package/kernel/linux/modules/other.mk | 6 +--- package/kernel/linux/modules/pcmcia.mk | 1 - package/kernel/linux/modules/sound.mk | 2 -- package/kernel/linux/modules/usb.mk | 34 ++++------------------ package/kernel/linux/modules/video.mk | 16 ++-------- package/kernel/linux/modules/virt.mk | 1 - package/kernel/linux/modules/wpan.mk | 1 - target/linux/airoha/modules.mk | 3 +- target/linux/bcm27xx/modules/sound.mk | 7 +---- target/linux/sunxi/modules.mk | 1 - 18 files changed, 22 insertions(+), 97 deletions(-) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index a3da30247cb..7847aaa5f44 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -225,7 +225,6 @@ define KernelPackage/dm CONFIG_DM_UEVENT=n \ CONFIG_DM_DELAY=n \ CONFIG_DM_LOG_WRITES=n \ - CONFIG_DM_MQ_DEFAULT=n \ CONFIG_DM_MULTIPATH=n \ CONFIG_DM_ZERO=n \ CONFIG_DM_SNAPSHOT=n \ @@ -299,8 +298,7 @@ define KernelPackage/md-mod KCONFIG:= \ CONFIG_MD=y \ CONFIG_BLK_DEV_MD=m \ - CONFIG_MD_AUTODETECT=y \ - CONFIG_MD_FAULTY=n + CONFIG_MD_AUTODETECT=y FILES:=$(LINUX_DIR)/drivers/md/md-mod.ko AUTOLOAD:=$(call AutoLoad,27,md-mod) endef @@ -389,8 +387,7 @@ $(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor) CONFIG_ASYNC_PQ \ CONFIG_ASYNC_RAID6_RECOV \ CONFIG_ASYNC_RAID6_TEST=n \ - CONFIG_MD_RAID456 \ - CONFIG_MULTICORE_RAID456=n + CONFIG_MD_RAID456 FILES:= \ $(LINUX_DIR)/crypto/async_tx/async_tx.ko \ $(LINUX_DIR)/crypto/async_tx/async_memcpy.ko \ @@ -425,8 +422,7 @@ define KernelPackage/libsas KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ CONFIG_SCSI_SAS_ATTRS \ CONFIG_SCSI_SAS_ATA=y \ - CONFIG_SCSI_SAS_HOST_SMP=y \ - CONFIG_SCSI_SAS_LIBSAS_DEBUG=y + CONFIG_SCSI_SAS_HOST_SMP=y FILES:= \ $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.ko \ $(LINUX_DIR)/drivers/scsi/libsas/libsas.ko @@ -444,8 +440,7 @@ define KernelPackage/loop SUBMENU:=$(BLOCK_MENU) TITLE:=Loopback device support KCONFIG:= \ - CONFIG_BLK_DEV_LOOP \ - CONFIG_BLK_DEV_CRYPTOLOOP=n + CONFIG_BLK_DEV_LOOP FILES:=$(LINUX_DIR)/drivers/block/loop.ko AUTOLOAD:=$(call AutoLoad,30,loop,1) endef @@ -559,8 +554,7 @@ define KernelPackage/scsi-cdrom TITLE:=Kernel support for CD / DVD drives DEPENDS:=+kmod-scsi-core +kmod-cdrom KCONFIG:= \ - CONFIG_BLK_DEV_SR \ - CONFIG_BLK_DEV_SR_VENDOR=n + CONFIG_BLK_DEV_SR FILES:=$(LINUX_DIR)/drivers/scsi/sr_mod.ko AUTOLOAD:=$(call AutoLoad,45,sr_mod) endef diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index 1a4c81cc31c..22d31f3eb60 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -15,13 +15,10 @@ define KernelPackage/can CONFIG_CAN_DEV \ CONFIG_CAN_NETLINK=y \ CONFIG_CAN_CALC_BITTIMING=y \ - CONFIG_CAN_LEDS=y \ CONFIG_CAN_AT91=n \ CONFIG_CAN_TI_HECC=n \ CONFIG_CAN_MCP251X=n \ - CONFIG_CAN_BFIN=n \ CONFIG_CAN_JANZ_ICAN3=n \ - CONFIG_PCH_CAN=n \ CONFIG_CAN_GRCAN=n \ CONFIG_CAN_CC770=n \ CONFIG_CAN_MSCAN=n \ diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 061b6178beb..5edc153a18f 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -315,7 +315,6 @@ $(eval $(call KernelPackage,crypto-xcbc)) define KernelPackage/crypto-gf128 TITLE:=GF(2^128) multiplication functions CryptoAPI module KCONFIG:= \ - CONFIG_CRYPTO_GF128MUL \ CONFIG_CRYPTO_LIB_GF128MUL FILES:=$(LINUX_DIR)/lib/crypto/gf128mul.ko AUTOLOAD:=$(call AutoLoad,09,gf128mul) diff --git a/package/kernel/linux/modules/firewire.mk b/package/kernel/linux/modules/firewire.mk index 1e2d94272a3..12867807337 100644 --- a/package/kernel/linux/modules/firewire.mk +++ b/package/kernel/linux/modules/firewire.mk @@ -43,9 +43,7 @@ define KernelPackage/firewire-ohci TITLE:=Support for OHCI-1394 controllers DEPENDS:=kmod-firewire KCONFIG:= \ - CONFIG_FIREWIRE_OHCI \ - CONFIG_FIREWIRE_OHCI_DEBUG=n \ - CONFIG_FIREWIRE_OHCI_REMOTE_DMA=n + CONFIG_FIREWIRE_OHCI FILES:=$(LINUX_DIR)/drivers/firewire/firewire-ohci.ko AUTOLOAD:=$(call AutoProbe,firewire-ohci) endef diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index 541edcaaa4a..ca1b56f0b0a 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -135,7 +135,6 @@ define KernelPackage/iio-ad799x DEPENDS:=+kmod-i2c-core +kmod-industrialio-triggered-buffer TITLE:=Analog Devices AD799x ADC driver KCONFIG:= \ - CONFIG_AD799X_RING_BUFFER=y \ CONFIG_AD799X FILES:=$(LINUX_DIR)/drivers/iio/adc/ad799x.ko AUTOLOAD:=$(call AutoLoad,56,ad799x) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 7914de22e25..7f3069e33be 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -275,8 +275,7 @@ define KernelPackage/et131x FILES:= \ $(LINUX_DIR)/drivers/net/ethernet/agere/et131x.ko KCONFIG:= \ - CONFIG_ET131X \ - CONFIG_ET131X_DEBUG=n + CONFIG_ET131X DEPENDS:=@PCI_SUPPORT +kmod-libphy AUTOLOAD:=$(call AutoProbe,et131x) endef @@ -1185,8 +1184,7 @@ define KernelPackage/r6040 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=RDC Fast-Ethernet support DEPENDS:=@PCI_SUPPORT +kmod-libphy - KCONFIG:=CONFIG_R6040 \ - CONFIG_R6040_NAPI=y + KCONFIG:=CONFIG_R6040 FILES:=$(LINUX_DIR)/drivers/net/ethernet/rdc/r6040.ko AUTOLOAD:=$(call AutoProbe,r6040) endef @@ -1395,9 +1393,7 @@ define KernelPackage/e1000 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) PRO/1000 PCI cards kernel support DEPENDS:=@PCI_SUPPORT - KCONFIG:=CONFIG_E1000 \ - CONFIG_E1000_DISABLE_PACKET_SPLIT=n \ - CONFIG_E1000_NAPI=y + KCONFIG:=CONFIG_E1000 FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko AUTOLOAD:=$(call AutoLoad,35,e1000,1) endef @@ -1708,7 +1704,6 @@ define KernelPackage/tulip CONFIG_TULIP_MMIO=y \ CONFIG_TULIP_NAPI=y \ CONFIG_TULIP_NAPI_HW_MITIGATION=y \ - CONFIG_DE4X5=n \ CONFIG_WINBOND_840 \ CONFIG_DM9102 \ CONFIG_ULI526X @@ -1785,7 +1780,6 @@ define KernelPackage/dm9000 TITLE:=Davicom 9000 Ethernet support DEPENDS:=+kmod-mii KCONFIG:=CONFIG_DM9000 \ - CONFIG_DM9000_DEBUGLEVEL=4 \ CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y FILES:=$(LINUX_DIR)/drivers/net/ethernet/davicom/dm9000.ko AUTOLOAD:=$(call AutoLoad,34,dm9000) @@ -1991,13 +1985,10 @@ define KernelPackage/mlx5-core CONFIG_MLX5_EN_TLS=n \ CONFIG_MLX5_ESWITCH=n \ CONFIG_MLX5_FPGA=n \ - CONFIG_MLX5_FPGA_IPSEC=n \ - CONFIG_MLX5_FPGA_TLS=n \ CONFIG_MLX5_MACSEC=y \ CONFIG_MLX5_MPFS=y \ CONFIG_MLX5_SW_STEERING=n \ CONFIG_MLX5_TC_CT=n \ - CONFIG_MLX5_TLS=n \ CONFIG_MLX5_VFIO_PCI=n AUTOLOAD:=$(call AutoLoad,45,mlx5_core,1) endef diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 7a0872cef87..cd1fd002834 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -209,8 +209,7 @@ define KernelPackage/nf-flow TITLE:=Netfilter flowtable support KCONFIG:= \ CONFIG_NETFILTER_INGRESS=y \ - CONFIG_NF_FLOW_TABLE \ - CONFIG_NF_FLOW_TABLE_HW + CONFIG_NF_FLOW_TABLE DEPENDS:=+kmod-nf-conntrack +kmod-nft-core FILES:= $(LINUX_DIR)/net/netfilter/nf_flow_table.ko AUTOLOAD:=$(call AutoProbe,nf_flow_table nf_flow_table_hw) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 9c3a974d136..a525576c859 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -46,9 +46,7 @@ define KernelPackage/appletalk SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Appletalk protocol support KCONFIG:= \ - CONFIG_ATALK \ - CONFIG_DEV_APPLETALK \ - CONFIG_IPDDP=n + CONFIG_ATALK FILES:=$(LINUX_DIR)/net/appletalk/appletalk.ko AUTOLOAD:=$(call AutoLoad,40,appletalk) endef diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 3717bd0b711..c49cadafde0 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -298,7 +298,6 @@ define KernelPackage/parport-pc CONFIG_PARPORT_PC_PCMCIA=n \ CONFIG_PARPORT_PC_SUPERIO=y \ CONFIG_PARPORT_SERIAL=n \ - CONFIG_PARIDE=n \ CONFIG_SCSI_IMM=n \ CONFIG_SCSI_PPA=n FILES:= \ @@ -331,7 +330,6 @@ define KernelPackage/mmc CONFIG_MMC \ CONFIG_MMC_BLOCK \ CONFIG_MMC_DEBUG=n \ - CONFIG_MMC_UNSAFE_RESUME=n \ CONFIG_MMC_TIFM_SD=n \ CONFIG_MMC_WBSD=n \ CONFIG_SDIO_UART=n @@ -421,8 +419,7 @@ define KernelPackage/ssb CONFIG_SSB_PCIHOST=y \ CONFIG_SSB_PCIHOST_POSSIBLE=y \ CONFIG_SSB_POSSIBLE=y \ - CONFIG_SSB_SPROM=y \ - CONFIG_SSB_SILENT=y + CONFIG_SSB_SPROM=y FILES:=$(LINUX_DIR)/drivers/ssb/ssb.ko AUTOLOAD:=$(call AutoLoad,18,ssb,1) endef @@ -739,7 +736,6 @@ define KernelPackage/zram KCONFIG:= \ CONFIG_ZSMALLOC \ CONFIG_ZRAM \ - CONFIG_ZRAM_DEBUG=n \ CONFIG_ZRAM_WRITEBACK=n \ CONFIG_ZSMALLOC_STAT=n FILES:= \ diff --git a/package/kernel/linux/modules/pcmcia.mk b/package/kernel/linux/modules/pcmcia.mk index 11c2106cb04..699425d07f8 100644 --- a/package/kernel/linux/modules/pcmcia.mk +++ b/package/kernel/linux/modules/pcmcia.mk @@ -66,7 +66,6 @@ $(eval $(call KernelPackage,pcmcia-yenta)) define KernelPackage/pcmcia-serial TITLE:=Serial devices support KCONFIG:= \ - CONFIG_PCMCIA_SERIAL_CS \ CONFIG_SERIAL_8250_CS FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/serial_cs.ko AUTOLOAD:=$(call AutoLoad,45,serial_cs) diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 4f55dfa3d50..c32b85149b4 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -191,7 +191,6 @@ define KernelPackage/sound-soc-core DEPENDS:=+kmod-regmap-core +kmod-ac97 KCONFIG:= \ CONFIG_SND_SOC \ - CONFIG_SND_SOC_ADI=n \ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y \ CONFIG_SND_SOC_ALL_CODECS=n FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko @@ -643,7 +642,6 @@ define KernelPackage/sound-hda-intel TITLE:=HD Audio Intel Driver DEPENDS:=@TARGET_x86 KCONFIG:= \ - CONFIG_SOUND_PCI \ CONFIG_SND_HDA_INTEL FILES:= \ $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko@lt6.18 \ diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index f86383db330..f7cc969f5c5 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -283,7 +283,6 @@ define KernelPackage/usb-uhci TITLE:=Support for UHCI controllers KCONFIG:= \ CONFIG_USB_PCI=y \ - CONFIG_USB_UHCI_ALT \ CONFIG_USB_UHCI_HCD FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko AUTOLOAD:=$(call AutoLoad,50,uhci-hcd,1) @@ -305,10 +304,8 @@ define KernelPackage/usb-ohci +TARGET_bcm47xx:kmod-usb-bcma \ +TARGET_bcm47xx:kmod-usb-ssb KCONFIG:= \ - CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ CONFIG_USB_OHCI_HCD_AT91=y \ - CONFIG_USB_OHCI_BCM63XX=y \ CONFIG_USB_OCTEON_OHCI=y \ CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_PLATFORM=y @@ -394,9 +391,6 @@ define KernelPackage/usb2 +kmod-usb-ehci KCONFIG:=\ CONFIG_USB_EHCI_HCD_PLATFORM \ - CONFIG_USB_EHCI_BCM63XX=y \ - CONFIG_USB_IMX21_HCD=y \ - CONFIG_USB_EHCI_MXC=y \ CONFIG_USB_OCTEON_EHCI=y \ CONFIG_USB_EHCI_HCD_ORION=y \ CONFIG_USB_EHCI_HCD_AT91=y \ @@ -534,9 +528,7 @@ define KernelPackage/usb-dwc3 +USB_SUPPORT:kmod-usb-core \ +kmod-usb-roles KCONFIG:= \ - CONFIG_USB_DWC3 \ - CONFIG_USB_DWC3_DEBUG=n \ - CONFIG_USB_DWC3_VERBOSE=n + CONFIG_USB_DWC3 ifeq ($(CONFIG_USB_SUPPORT)$(CONFIG_USB_GADGET_SUPPORT),yy) KCONFIG+= \ CONFIG_USB_DWC3_HOST=n \ @@ -1005,19 +997,7 @@ $(eval $(call KernelPackage,usb-serial-cypress-m8)) define KernelPackage/usb-serial-keyspan TITLE:=Support for Keyspan USB-to-Serial devices KCONFIG:= \ - CONFIG_USB_SERIAL_KEYSPAN \ - CONFIG_USB_SERIAL_KEYSPAN_USA28 \ - CONFIG_USB_SERIAL_KEYSPAN_USA28X \ - CONFIG_USB_SERIAL_KEYSPAN_USA28XA \ - CONFIG_USB_SERIAL_KEYSPAN_USA28XB \ - CONFIG_USB_SERIAL_KEYSPAN_USA19 \ - CONFIG_USB_SERIAL_KEYSPAN_USA18X \ - CONFIG_USB_SERIAL_KEYSPAN_USA19W \ - CONFIG_USB_SERIAL_KEYSPAN_USA19QW \ - CONFIG_USB_SERIAL_KEYSPAN_USA19QI \ - CONFIG_USB_SERIAL_KEYSPAN_MPR \ - CONFIG_USB_SERIAL_KEYSPAN_USA49W \ - CONFIG_USB_SERIAL_KEYSPAN_USA49WLC + CONFIG_USB_SERIAL_KEYSPAN FILES:= \ $(LINUX_DIR)/drivers/usb/serial/keyspan.ko \ $(wildcard $(LINUX_DIR)/drivers/usb/misc/ezusb.ko) @@ -1712,7 +1692,7 @@ $(eval $(call KernelPackage,usb-hid-mcp2221)) define KernelPackage/usb-yealink TITLE:=USB Yealink VOIP phone DEPENDS:=+kmod-input-evdev - KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y + KCONFIG:=CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko AUTOLOAD:=$(call AutoProbe,yealink) $(call AddDepends/usb) @@ -1728,7 +1708,7 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 TITLE:=Support for CM109 device DEPENDS:=+kmod-input-evdev - KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y + KCONFIG:=CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko AUTOLOAD:=$(call AutoProbe,cm109) $(call AddDepends/usb) @@ -1801,8 +1781,7 @@ define KernelPackage/usb-chipidea CONFIG_USB_CHIPIDEA \ CONFIG_USB_CHIPIDEA_GENERIC \ CONFIG_USB_CHIPIDEA_HOST=y \ - CONFIG_USB_CHIPIDEA_UDC=y \ - CONFIG_USB_CHIPIDEA_DEBUG=y + CONFIG_USB_CHIPIDEA_UDC=y FILES:= \ $(LINUX_DIR)/drivers/extcon/extcon-core.ko \ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ @@ -1825,8 +1804,7 @@ define KernelPackage/usb-chipidea2 CONFIG_EXTCON \ CONFIG_USB_CHIPIDEA \ CONFIG_USB_CHIPIDEA_HOST=y \ - CONFIG_USB_CHIPIDEA_UDC=y \ - CONFIG_USB_CHIPIDEA_DEBUG=y + CONFIG_USB_CHIPIDEA_UDC=y FILES:= \ $(LINUX_DIR)/drivers/extcon/extcon-core.ko \ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_usb2.ko diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index bb9acf51724..586f83723c6 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -64,13 +64,9 @@ define KernelPackage/backlight DEPENDS:=video-support HIDDEN:=1 KCONFIG:=CONFIG_BACKLIGHT_CLASS_DEVICE \ - CONFIG_BACKLIGHT_LCD_SUPPORT=y \ CONFIG_LCD_CLASS_DEVICE=n \ - CONFIG_BACKLIGHT_GENERIC=n \ CONFIG_BACKLIGHT_ADP8860=n \ - CONFIG_BACKLIGHT_ADP8870=n \ - CONFIG_BACKLIGHT_OT200=n \ - CONFIG_BACKLIGHT_PM8941_WLED=n + CONFIG_BACKLIGHT_ADP8870=n FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko AUTOLOAD:=$(call AutoProbe,video backlight) endef @@ -119,7 +115,6 @@ define KernelPackage/fb KCONFIG:= \ CONFIG_FB \ CONFIG_FB_DEVICE=y \ - CONFIG_FB_MXS=n \ CONFIG_FB_SM750=n \ CONFIG_FRAMEBUFFER_CONSOLE=y \ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y \ @@ -469,8 +464,7 @@ define KernelPackage/drm-ttm-helper TITLE:=Helpers for ttm-based gem objects HIDDEN:=1 DEPENDS:=video-support +kmod-drm-ttm +kmod-drm-kms-helper - KCONFIG:=CONFIG_DRM_TTM_HELPER \ - CONFIG_DRM_DISPLAY_HELPER_CEC=n + KCONFIG:=CONFIG_DRM_TTM_HELPER FILES:=$(LINUX_DIR)/drivers/gpu/drm/drm_ttm_helper.ko AUTOLOAD:=$(call AutoProbe,drm_ttm_helper) endef @@ -759,10 +753,6 @@ define KernelPackage/drm-imx KCONFIG:=CONFIG_DRM_IMX \ CONFIG_IMX_IPUV3_CORE \ CONFIG_RESET_CONTROLLER=y \ - CONFIG_DRM_IMX_IPUV3 \ - CONFIG_IMX_IPUV3 \ - CONFIG_DRM_GEM_CMA_HELPER=y \ - CONFIG_DRM_KMS_CMA_HELPER=y \ CONFIG_DRM_IMX_PARALLEL_DISPLAY=n \ CONFIG_DRM_IMX_TVE=n \ CONFIG_DRM_IMX_LDB=n \ @@ -810,9 +800,7 @@ define KernelPackage/drm-imx-ldb CONFIG_DRM_PANEL_SAMSUNG_LD9040=n \ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=n \ CONFIG_DRM_PANEL_LG_LG4573=n \ - CONFIG_DRM_PANEL_LD9040=n \ CONFIG_DRM_PANEL_LVDS=n \ - CONFIG_DRM_PANEL_S6E8AA0=n \ CONFIG_DRM_PANEL_SITRONIX_ST7789V=n FILES:= \ $(LINUX_DIR)/drivers/gpu/drm/bridge/imx/imx-legacy-bridge.ko@ge6.18 \ diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index 661aa1403c0..e2204a2ee18 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -21,7 +21,6 @@ define KernelPackage/kvm-x86 DEPENDS:=@TARGET_x86_generic||TARGET_x86_64 +kmod-irqbypass KCONFIG:=\ CONFIG_KVM \ - CONFIG_KVM_MMU_AUDIT=n \ CONFIG_KVM_SMM=y \ CONFIG_VIRTUALIZATION=y FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm.ko diff --git a/package/kernel/linux/modules/wpan.mk b/package/kernel/linux/modules/wpan.mk index dab8a0cb71d..b47ebc64f8d 100644 --- a/package/kernel/linux/modules/wpan.mk +++ b/package/kernel/linux/modules/wpan.mk @@ -84,7 +84,6 @@ define KernelPackage/at86rf230 TITLE:=AT86RF230 transceiver driver DEPENDS:=+kmod-mac802154 +kmod-regmap-spi KCONFIG:=CONFIG_IEEE802154_AT86RF230 \ - CONFIG_IEEE802154_AT86RF230_DEBUGFS=n \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y FILES:=$(LINUX_DIR)/drivers/net/ieee802154/at86rf230.ko diff --git a/target/linux/airoha/modules.mk b/target/linux/airoha/modules.mk index f55e1c0cd4f..f1b1a40a0bb 100644 --- a/target/linux/airoha/modules.mk +++ b/target/linux/airoha/modules.mk @@ -9,8 +9,7 @@ define KernelPackage/pwm-airoha DEPENDS:=@TARGET_airoha_an7581||TARGET_airoha_an7583 KCONFIG:= \ CONFIG_PWM=y \ - CONFIG_PWM_AIROHA=y \ - CONFIG_PWM_SYSFS=y + CONFIG_PWM_AIROHA=y FILES:= \ $(LINUX_DIR)/drivers/pwm/pwm-airoha.ko AUTOLOAD:=$(call AutoProbe,pwm-airoha) diff --git a/target/linux/bcm27xx/modules/sound.mk b/target/linux/bcm27xx/modules/sound.mk index f2d0acf9af1..cd98587973c 100644 --- a/target/linux/bcm27xx/modules/sound.mk +++ b/target/linux/bcm27xx/modules/sound.mk @@ -26,7 +26,6 @@ define KernelPackage/sound-soc-bcm2835-i2s TITLE:=SoC Audio support for the Broadcom 2835 I2S module KCONFIG:= \ CONFIG_SND_BCM2835_SOC_I2S \ - CONFIG_SND_SOC_DMAENGINE_PCM=y \ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-bcm2835-i2s.ko @@ -509,8 +508,7 @@ $(eval $(call KernelPackage,sound-soc-fe-pi)) define KernelPackage/sound-soc-googlevoicehat TITLE:=Support for Google VoiceHAT Sound Card KCONFIG:= \ - CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD \ - CONFIG_SND_SOC_VOICEHAT + CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-googlevoicehat-codec.ko AUTOLOAD:=$(call AutoLoad,68,snd-soc-googlevoicehat-codec) @@ -531,7 +529,6 @@ define KernelPackage/sound-soc-hifiberry-adc TITLE:=Support for HifiBerry ADC KCONFIG:= \ CONFIG_SND_BCM2708_SOC_HIFIBERRY_ADC \ - CONFIG_SND_RPI_HIFIBERRY_ADC \ CONFIG_SND_SOC_PCM186X_I2C FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-hifiberry-adc.ko \ @@ -937,7 +934,6 @@ define KernelPackage/sound-soc-pifi-40-amp TITLE:=Support for PiFi-40 amp KCONFIG:= \ CONFIG_SND_BCM2708_SOC_PIFI_40 \ - CONFIG_SND_PIFI_40 \ CONFIG_SND_SOC_TAS571X FILES:= \ $(LINUX_DIR)/sound/soc/bcm/snd-soc-pifi-40.ko \ @@ -988,7 +984,6 @@ define KernelPackage/sound-soc-rpi-cirrus CONFIG_MFD_WM5110=n \ CONFIG_MFD_WM8997=n \ CONFIG_MFD_WM8998=n \ - CONFIG_REGULATOR_ARIZONA \ CONFIG_REGULATOR_ARIZONA_LDO1 \ CONFIG_REGULATOR_ARIZONA_MICSUPP \ CONFIG_SND_BCM2708_SOC_RPI_CIRRUS \ diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk index 28ed86ba4c9..3a1c723991e 100644 --- a/target/linux/sunxi/modules.mk +++ b/target/linux/sunxi/modules.mk @@ -59,7 +59,6 @@ define KernelPackage/sunxi-ir DEPENDS:=@(TARGET_sunxi&&RTC_SUPPORT) +kmod-input-core KCONFIG:= \ CONFIG_MEDIA_SUPPORT=y \ - CONFIG_MEDIA_RC_SUPPORT=y \ CONFIG_RC_DEVICES=y \ CONFIG_RC_CORE=y \ CONFIG_IR_SUNXI