From 367813b9b17c50b9e1bc25933a3ccd252c0813e4 Mon Sep 17 00:00:00 2001 From: Deng Qingfang Date: Fri, 19 Apr 2019 18:04:56 +0800 Subject: [PATCH] ramips: mt7620: fix dependencies MT7620 integrated WMAC does not need RT2x00 PCI driver or firmware Also corrected kmod-eeprom-93cx6 and kmod-lib-crc-itu-t dependencies according to original Kconfig and lsmod output This will remove some unnecessary packages from MT7620 target to save some space Signed-off-by: Deng Qingfang Signed-off-by: Christian Lamparter [75 characters per line in the commit message] --- package/kernel/mac80211/ralink.mk | 14 +++++++------- target/linux/ramips/mt7620/target.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/kernel/mac80211/ralink.mk b/package/kernel/mac80211/ralink.mk index 3b173692f4..6aca170773 100644 --- a/package/kernel/mac80211/ralink.mk +++ b/package/kernel/mac80211/ralink.mk @@ -37,7 +37,7 @@ endef define KernelPackage/rt2x00-lib $(call KernelPackage/rt2x00/Default) - DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-lib-crc-itu-t + DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 TITLE+= (LIB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2x00lib.ko MENU:=1 @@ -64,7 +64,7 @@ endef define KernelPackage/rt2x00-mmio $(call KernelPackage/rt2x00/Default) - DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-eeprom-93cx6 + DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib HIDDEN:=1 TITLE+= (MMIO) FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.ko @@ -98,7 +98,7 @@ endef define KernelPackage/rt2400-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci + DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-eeprom-93cx6 TITLE+= (RT2400 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2400pci.ko AUTOLOAD:=$(call AutoProbe,rt2400pci) @@ -106,7 +106,7 @@ endef define KernelPackage/rt2500-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci + DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-eeprom-93cx6 TITLE+= (RT2500 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2500pci.ko AUTOLOAD:=$(call AutoProbe,rt2500pci) @@ -140,7 +140,7 @@ endef define KernelPackage/rt2800-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-rt2800-mmio +rt2800-pci-firmware + DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-rt2800-mmio +kmod-eeprom-93cx6 +rt2800-pci-firmware TITLE+= (RT2860 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2800pci.ko AUTOLOAD:=$(call AutoProbe,rt2800pci) @@ -157,7 +157,7 @@ endef define KernelPackage/rt61-pci $(call KernelPackage/rt2x00/Default) - DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +rt61-pci-firmware + DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-eeprom-93cx6 +kmod-lib-crc-itu-t +rt61-pci-firmware TITLE+= (RT2x61 PCI) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt61pci.ko AUTOLOAD:=$(call AutoProbe,rt61pci) @@ -165,7 +165,7 @@ endef define KernelPackage/rt73-usb $(call KernelPackage/rt2x00/Default) - DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +rt73-usb-firmware + DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-lib-crc-itu-t +rt73-usb-firmware TITLE+= (RT73 USB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt73usb.ko AUTOLOAD:=$(call AutoProbe,rt73usb) diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk index 544254604e..788c9a1dfc 100644 --- a/target/linux/ramips/mt7620/target.mk +++ b/target/linux/ramips/mt7620/target.mk @@ -7,7 +7,7 @@ BOARDNAME:=MT7620 based boards FEATURES+=usb CPU_TYPE:=24kc -DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-basic +DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic define Target/Description Build firmware images for Ralink MT7620 based boards. -- 2.30.2