domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: cleanup kernel symbol references

Browse Source 
We only use 5.15 kernel. So remove all those unnecessary symbols
referencing 5.10 or 5.15 kernel.

Can be found with:
  git grep -E 'LINUX_5_1(0|5)'

Note that we remove the dependency from "sound-soc-chipdip-dac" instead
of removing the complete kernel package. The 5.15 version bump forgot to
delete the "@LINUX_5_10" dependency. The kernel package is still needed
in 5.15 kernel.

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke
2023-05-04 22:47:27 +02:00
committed by Christian Marangi
parent d798617d4a
commit 047361dee4
14 changed files with 19 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/Config-kernel.in
View File

@@ -1107,7 +1107,6 @@ config KERNEL_PAGE_POOL
config KERNEL_PAGE_POOL_STATS config KERNEL_PAGE_POOL_STATS
bool "Page pool stats support" bool "Page pool stats support"
depends on KERNEL_PAGE_POOL depends on KERNEL_PAGE_POOL
depends on !LINUX_5_10
# #
# NFS related symbols # NFS related symbols

4
package/kernel/linux/modules/crypto.mk
View File

@@ -824,9 +824,7 @@ $(eval $(call KernelPackage,crypto-rmd160))
define KernelPackage/crypto-rng define KernelPackage/crypto-rng
TITLE:=CryptoAPI random number generation TITLE:=CryptoAPI random number generation
DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac \ DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512
+LINUX_5_10:kmod-crypto-sha256 \
+LINUX_5_15:kmod-crypto-sha512
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_DRBG \ CONFIG_CRYPTO_DRBG \
CONFIG_CRYPTO_DRBG_HMAC=y \ CONFIG_CRYPTO_DRBG_HMAC=y \

10
package/kernel/linux/modules/fs.mk
View File

@@ -98,20 +98,18 @@ define KernelPackage/fs-cifs
AUTOLOAD:=$(call AutoLoad,30,cifs) AUTOLOAD:=$(call AutoLoad,30,cifs)
$(call AddDepends/nls) $(call AddDepends/nls)
DEPENDS+= \ DEPENDS+= \
+LINUX_5_10:kmod-crypto-md4\
+kmod-crypto-md5 \ +kmod-crypto-md5 \
+kmod-crypto-sha256 \ +kmod-crypto-sha256 \
+kmod-crypto-sha512 \ +kmod-crypto-sha512 \
+kmod-crypto-cmac \ +kmod-crypto-cmac \
+kmod-crypto-hmac \ +kmod-crypto-hmac \
+LINUX_5_10:kmod-crypto-arc4 \
+kmod-crypto-aead \ +kmod-crypto-aead \
+kmod-crypto-ccm \ +kmod-crypto-ccm \
+kmod-crypto-ecb \ +kmod-crypto-ecb \
+kmod-crypto-des \ +kmod-crypto-des \
+(LINUX_5_15):kmod-asn1-decoder \ +kmod-asn1-decoder \
+(LINUX_5_15):kmod-oid-registry \ +kmod-oid-registry \
+(LINUX_5_15):kmod-dnsresolver +kmod-dnsresolver
endef endef
define KernelPackage/fs-cifs/description define KernelPackage/fs-cifs/description
@@ -367,7 +365,6 @@ $(eval $(call KernelPackage,fs-msdos))
define KernelPackage/fs-netfs define KernelPackage/fs-netfs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=Network Filesystems support TITLE:=Network Filesystems support
DEPENDS:=@LINUX_5_15
KCONFIG:= CONFIG_NETFS_SUPPORT KCONFIG:= CONFIG_NETFS_SUPPORT
FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko
AUTOLOAD:=$(call AutoLoad,28,netfs) AUTOLOAD:=$(call AutoLoad,28,netfs)
@@ -531,7 +528,6 @@ define KernelPackage/fs-ntfs3
KCONFIG:= CONFIG_NTFS3_FS CONFIG_NTFS3_FS_POSIX_ACL=y KCONFIG:= CONFIG_NTFS3_FS CONFIG_NTFS3_FS_POSIX_ACL=y
FILES:=$(LINUX_DIR)/fs/ntfs3/ntfs3.ko FILES:=$(LINUX_DIR)/fs/ntfs3/ntfs3.ko
$(call AddDepends/nls) $(call AddDepends/nls)
DEPENDS+=@!LINUX_5_10
AUTOLOAD:=$(call AutoLoad,80,ntfs3) AUTOLOAD:=$(call AutoLoad,80,ntfs3)
endef endef

17
package/kernel/linux/modules/input.mk
View File

@@ -92,7 +92,7 @@ $(eval $(call KernelPackage,input-gpio-keys))
define KernelPackage/input-gpio-keys-polled define KernelPackage/input-gpio-keys-polled
SUBMENU:=$(INPUT_MODULES_MENU) SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=Polled GPIO key support TITLE:=Polled GPIO key support
DEPENDS:=@GPIO_SUPPORT +kmod-input-core +LINUX_5_10:kmod-input-polldev DEPENDS:=@GPIO_SUPPORT +kmod-input-core
KCONFIG:= \ KCONFIG:= \
CONFIG_KEYBOARD_GPIO_POLLED \ CONFIG_KEYBOARD_GPIO_POLLED \
CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_KEYBOARD=y
@@ -142,21 +142,6 @@ endef
$(eval $(call KernelPackage,input-joydev)) $(eval $(call KernelPackage,input-joydev))
define KernelPackage/input-polldev
SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=Polled Input device support
DEPENDS:=+kmod-input-core @LINUX_5_10
KCONFIG:=CONFIG_INPUT_POLLDEV
FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko
endef
define KernelPackage/input-polldev/description
Kernel module for support of polled input devices
endef
$(eval $(call KernelPackage,input-polldev))
define KernelPackage/input-matrixkmap define KernelPackage/input-matrixkmap
SUBMENU:=$(INPUT_MODULES_MENU) SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=Input matrix devices support TITLE:=Input matrix devices support

1
package/kernel/linux/modules/leds.mk
View File

@@ -118,7 +118,6 @@ $(eval $(call KernelPackage,ledtrig-pattern))
define KernelPackage/ledtrig-tty define KernelPackage/ledtrig-tty
SUBMENU:=$(LEDS_MENU) SUBMENU:=$(LEDS_MENU)
TITLE:=LED Trigger for TTY devices TITLE:=LED Trigger for TTY devices
DEPENDS:=@LINUX_5_15
KCONFIG:=CONFIG_LEDS_TRIGGER_TTY KCONFIG:=CONFIG_LEDS_TRIGGER_TTY
FILES:=$(LED_TRIGGER_DIR)/ledtrig-tty.ko FILES:=$(LED_TRIGGER_DIR)/ledtrig-tty.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-tty) AUTOLOAD:=$(call AutoLoad,50,ledtrig-tty)

7
package/kernel/linux/modules/netdevices.mk
View File

@@ -1448,7 +1448,6 @@ $(eval $(call KernelPackage,sfc-falcon))
define KernelPackage/wwan define KernelPackage/wwan
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=WWAN Driver Core TITLE:=WWAN Driver Core
DEPENDS:=@LINUX_5_15
KCONFIG:=CONFIG_WWAN KCONFIG:=CONFIG_WWAN
FILES:=$(LINUX_DIR)/drivers/net/wwan/wwan.ko FILES:=$(LINUX_DIR)/drivers/net/wwan/wwan.ko
AUTOLOAD:=$(call AutoProbe,wwan) AUTOLOAD:=$(call AutoProbe,wwan)
@@ -1464,7 +1463,7 @@ $(eval $(call KernelPackage,wwan))
define KernelPackage/mhi-net define KernelPackage/mhi-net
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=MHI Network Device TITLE:=MHI Network Device
DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus DEPENDS:=@PCI_SUPPORT +kmod-mhi-bus
KCONFIG:=CONFIG_MHI_NET KCONFIG:=CONFIG_MHI_NET
FILES:=$(LINUX_DIR)/drivers/net/mhi_net.ko FILES:=$(LINUX_DIR)/drivers/net/mhi_net.ko
AUTOLOAD:=$(call AutoProbe,mhi_net) AUTOLOAD:=$(call AutoProbe,mhi_net)
@@ -1479,7 +1478,7 @@ $(eval $(call KernelPackage,mhi-net))
define KernelPackage/mhi-wwan-ctrl define KernelPackage/mhi-wwan-ctrl
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=MHI WWAN Control TITLE:=MHI WWAN Control
DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus +kmod-wwan DEPENDS:=@PCI_SUPPORT +kmod-mhi-bus +kmod-wwan
KCONFIG:=CONFIG_MHI_WWAN_CTRL KCONFIG:=CONFIG_MHI_WWAN_CTRL
FILES:=$(LINUX_DIR)/drivers/net/wwan/mhi_wwan_ctrl.ko FILES:=$(LINUX_DIR)/drivers/net/wwan/mhi_wwan_ctrl.ko
AUTOLOAD:=$(call AutoProbe,mhi_wwan_ctrl) AUTOLOAD:=$(call AutoProbe,mhi_wwan_ctrl)
@@ -1495,7 +1494,7 @@ $(eval $(call KernelPackage,mhi-wwan-ctrl))
define KernelPackage/mhi-wwan-mbim define KernelPackage/mhi-wwan-mbim
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=MHI MBIM TITLE:=MHI MBIM
DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus +kmod-wwan DEPENDS:=@PCI_SUPPORT +kmod-mhi-bus +kmod-wwan
KCONFIG:=CONFIG_MHI_WWAN_MBIM KCONFIG:=CONFIG_MHI_WWAN_MBIM
FILES:=$(LINUX_DIR)/drivers/net/wwan/mhi_wwan_mbim.ko FILES:=$(LINUX_DIR)/drivers/net/wwan/mhi_wwan_mbim.ko
AUTOLOAD:=$(call AutoProbe,mhi_wwan_mbim) AUTOLOAD:=$(call AutoProbe,mhi_wwan_mbim)

3
package/kernel/linux/modules/netsupport.mk
View File

@@ -1187,7 +1187,7 @@ define KernelPackage/sctp
FILES:= $(LINUX_DIR)/net/sctp/sctp.ko FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
AUTOLOAD:= $(call AutoLoad,32,sctp) AUTOLOAD:= $(call AutoLoad,32,sctp)
DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac \ DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac \
+LINUX_5_15:kmod-udptunnel4 +LINUX_5_15:kmod-udptunnel6 +kmod-udptunnel4 +kmod-udptunnel6
endef endef
define KernelPackage/sctp/description define KernelPackage/sctp/description
@@ -1443,7 +1443,6 @@ define KernelPackage/qrtr
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Qualcomm IPC Router support TITLE:=Qualcomm IPC Router support
HIDDEN:=1 HIDDEN:=1
DEPENDS:=@!LINUX_5_10
KCONFIG:=CONFIG_QRTR KCONFIG:=CONFIG_QRTR
FILES:= \ FILES:= \
$(LINUX_DIR)/net/qrtr/qrtr.ko $(LINUX_DIR)/net/qrtr/qrtr.ko

7
package/kernel/linux/modules/other.mk
View File

@@ -1251,8 +1251,8 @@ $(eval $(call KernelPackage,keys-trusted))
define KernelPackage/tpm define KernelPackage/tpm
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=TPM Hardware Support TITLE:=TPM Hardware Support
DEPENDS:= +kmod-random-core +(LINUX_5_15):kmod-asn1-decoder \ DEPENDS:= +kmod-random-core +kmod-asn1-decoder \
+(LINUX_5_15):kmod-asn1-encoder +(LINUX_5_15):kmod-oid-registry +kmod-asn1-encoder +kmod-oid-registry
KCONFIG:= CONFIG_TCG_TPM KCONFIG:= CONFIG_TCG_TPM
FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko
AUTOLOAD:=$(call AutoLoad,10,tpm,1) AUTOLOAD:=$(call AutoLoad,10,tpm,1)
@@ -1336,7 +1336,6 @@ $(eval $(call KernelPackage,i6300esb-wdt))
define KernelPackage/mhi-bus define KernelPackage/mhi-bus
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=MHI bus TITLE:=MHI bus
DEPENDS:=@LINUX_5_15
KCONFIG:=CONFIG_MHI_BUS \ KCONFIG:=CONFIG_MHI_BUS \
CONFIG_MHI_BUS_DEBUG=y CONFIG_MHI_BUS_DEBUG=y
FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko
@@ -1352,7 +1351,7 @@ $(eval $(call KernelPackage,mhi-bus))
define KernelPackage/mhi-pci-generic define KernelPackage/mhi-pci-generic
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=MHI PCI controller driver TITLE:=MHI PCI controller driver
DEPENDS:=@LINUX_5_15 @PCI_SUPPORT +kmod-mhi-bus DEPENDS:=@PCI_SUPPORT +kmod-mhi-bus
KCONFIG:=CONFIG_MHI_BUS_PCI_GENERIC KCONFIG:=CONFIG_MHI_BUS_PCI_GENERIC
FILES:=$(LINUX_DIR)/drivers/bus/mhi/mhi_pci_generic.ko FILES:=$(LINUX_DIR)/drivers/bus/mhi/mhi_pci_generic.ko
AUTOLOAD:=$(call AutoProbe,mhi_pci_generic) AUTOLOAD:=$(call AutoProbe,mhi_pci_generic)

4
package/kernel/linux/modules/usb.mk
View File

@@ -1155,7 +1155,7 @@ $(eval $(call KernelPackage,usb-net-aqc111))
define KernelPackage/usb-net-asix define KernelPackage/usb-net-asix
TITLE:=Kernel module for USB-to-Ethernet Asix convertors TITLE:=Kernel module for USB-to-Ethernet Asix convertors
DEPENDS:=+kmod-libphy +LINUX_5_15:kmod-net-selftests +LINUX_5_15:kmod-mdio-devres +kmod-phy-ax88796b DEPENDS:=+kmod-libphy +kmod-net-selftests +kmod-mdio-devres +kmod-phy-ax88796b
KCONFIG:=CONFIG_USB_NET_AX8817X KCONFIG:=CONFIG_USB_NET_AX8817X
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
AUTOLOAD:=$(call AutoProbe,asix) AUTOLOAD:=$(call AutoProbe,asix)
@@ -1394,7 +1394,7 @@ define KernelPackage/usb-net-rtl8152
KCONFIG:=CONFIG_USB_RTL8152 KCONFIG:=CONFIG_USB_RTL8152
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko
AUTOLOAD:=$(call AutoProbe,r8152) AUTOLOAD:=$(call AutoProbe,r8152)
$(call AddDepends/usb-net, +LINUX_5_10:kmod-crypto-hash) $(call AddDepends/usb-net)
endef endef
define KernelPackage/usb-net-rtl8152/description define KernelPackage/usb-net-rtl8152/description

2
package/kernel/linux/modules/video.mk
View File

@@ -226,7 +226,7 @@ define KernelPackage/drm
TITLE:=Direct Rendering Manager (DRM) support TITLE:=Direct Rendering Manager (DRM) support
HIDDEN:=1 HIDDEN:=1
DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight \ DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight \
+(LINUX_5_15):kmod-fb +kmod-fb
KCONFIG:=CONFIG_DRM KCONFIG:=CONFIG_DRM
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/gpu/drm/drm.ko \ $(LINUX_DIR)/drivers/gpu/drm/drm.ko \

2
target/linux/bcm27xx/modules/other.mk
View File

@@ -10,7 +10,7 @@ define KernelPackage/pwm-raspberrypi-poe
CONFIG_PWM_RASPBERRYPI_POE CONFIG_PWM_RASPBERRYPI_POE
FILES:=$(LINUX_DIR)/drivers/pwm/pwm-raspberrypi-poe.ko FILES:=$(LINUX_DIR)/drivers/pwm/pwm-raspberrypi-poe.ko
AUTOLOAD:=$(call AutoLoad,20,pwm-raspberrypi-poe) AUTOLOAD:=$(call AutoLoad,20,pwm-raspberrypi-poe)
DEPENDS:=@TARGET_bcm27xx @LINUX_5_15 +kmod-hwmon-pwmfan DEPENDS:=@TARGET_bcm27xx +kmod-hwmon-pwmfan
endef endef
define KernelPackage/pwm-raspberrypi-poe/description define KernelPackage/pwm-raspberrypi-poe/description

3
target/linux/bcm27xx/modules/sound.mk
View File

@@ -371,8 +371,7 @@ define KernelPackage/sound-soc-chipdip-dac
$(LINUX_DIR)/sound/soc/bcm/snd-soc-chipdip-dac.ko $(LINUX_DIR)/sound/soc/bcm/snd-soc-chipdip-dac.ko
AUTOLOAD:=$(call AutoLoad,68,snd-soc-chipdip-dac) AUTOLOAD:=$(call AutoLoad,68,snd-soc-chipdip-dac)
DEPENDS:= \ DEPENDS:= \
kmod-sound-soc-bcm2835-i2s \ kmod-sound-soc-bcm2835-i2s
@LINUX_5_10
$(call AddDepends/sound) $(call AddDepends/sound)
endef endef

6
target/linux/pistachio/image/Makefile
View File

@@ -5,11 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
ifdef CONFIG_LINUX_5_10 KERNEL_LOADADDR := 0x80100000
KERNEL_LOADADDR := 0x80400000
else
KERNEL_LOADADDR := 0x80100000
endif
define Device/Default define Device/Default
PROFILES := Default PROFILES := Default

2
target/linux/x86/modules.mk
View File

@@ -22,7 +22,7 @@ $(eval $(call KernelPackage,amazon-ena))
define KernelPackage/amd-xgbe define KernelPackage/amd-xgbe
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=AMD Ethernet on SoC support TITLE:=AMD Ethernet on SoC support
DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +(LINUX_5_10||LINUX_5_15):kmod-mdio-devres DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +kmod-mdio-devres
KCONFIG:=CONFIG_AMD_XGBE KCONFIG:=CONFIG_AMD_XGBE
FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/xgbe/amd-xgbe.ko FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/xgbe/amd-xgbe.ko
AUTOLOAD:=$(call AutoLoad,35,amd-xgbe) AUTOLOAD:=$(call AutoLoad,35,amd-xgbe)