Newer kernels make use of libahci in ahci-platform, ie. also on non-PCI platforms. As there is no single config symbol deciding whether libahci.ko is being built or not it seems the most sensitive thing to package it in kmod-ata-core.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 46701
This commit is contained in:
Zoltan Herpai 2015-08-21 09:48:05 +00:00
parent 87a70e0774
commit fdf3c6bf6e

View File

@ -25,9 +25,12 @@ $(eval $(call KernelPackage,aoe))
define KernelPackage/ata-core define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU) SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support TITLE:=Serial and Parallel ATA support
DEPENDS:=@PCI_SUPPORT +kmod-scsi-core DEPENDS:=@PCI_SUPPORT||TARGET_sunxi +kmod-scsi-core
KCONFIG:=CONFIG_ATA KCONFIG:=CONFIG_ATA
FILES:=$(LINUX_DIR)/drivers/ata/libata.ko FILES:=$(LINUX_DIR)/drivers/ata/libata.ko
ifneq ($(wildcard $(LINUX_DIR)/drivers/ata/libahci.ko),)
FILES+=$(LINUX_DIR)/drivers/ata/libahci.ko
endif
endef endef
$(eval $(call KernelPackage,ata-core)) $(eval $(call KernelPackage,ata-core))
@ -43,8 +46,7 @@ define KernelPackage/ata-ahci
TITLE:=AHCI Serial ATA support TITLE:=AHCI Serial ATA support
KCONFIG:=CONFIG_SATA_AHCI KCONFIG:=CONFIG_SATA_AHCI
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/ata/ahci.ko \ $(LINUX_DIR)/drivers/ata/ahci.ko
$(LINUX_DIR)/drivers/ata/libahci.ko
AUTOLOAD:=$(call AutoLoad,41,libahci ahci,1) AUTOLOAD:=$(call AutoLoad,41,libahci ahci,1)
$(call AddDepends/ata) $(call AddDepends/ata)
endef endef
@ -62,8 +64,8 @@ define KernelPackage/ata-ahci-platform
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/ata/ahci_platform.ko \ $(LINUX_DIR)/drivers/ata/ahci_platform.ko \
$(LINUX_DIR)/drivers/ata/libahci_platform.ko $(LINUX_DIR)/drivers/ata/libahci_platform.ko
AUTOLOAD:=$(call AutoLoad,40,libahci_platform ahci_platform,1) AUTOLOAD:=$(call AutoLoad,40,libahci libahci_platform ahci_platform,1)
$(call AddDepends/ata,@TARGET_ipq806x||TARGET_mvebu +kmod-ata-ahci) $(call AddDepends/ata,@TARGET_ipq806x||TARGET_mvebu||TARGET_sunxi)
endef endef
define KernelPackage/ata-ahci-platform/description define KernelPackage/ata-ahci-platform/description