From: wigyori <wigyori@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 21 Aug 2015 09:48:05 +0000 (+0000)
Subject: Newer kernels make use of libahci in ahci-platform, ie. also on non-PCI
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=66938a13610be9d3bd856bd4f93200109a7e835e;p=openwrt.git

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>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46701 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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