From patchwork Fri Dec 12 13:56:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 420490 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 561F31400E9 for ; Sat, 13 Dec 2014 00:55:50 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3097828C1C5; Fri, 12 Dec 2014 14:53:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6FC26280419 for ; Fri, 12 Dec 2014 14:53:51 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -7.6 Received: from fudo.makrotopia.org (fudo.makrotopia.org [5.135.190.93]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 12 Dec 2014 14:53:51 +0100 (CET) Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1XzQgz-000377-2O; Fri, 12 Dec 2014 14:55:37 +0100 Date: Fri, 12 Dec 2014 14:56:33 +0100 From: Daniel Golle To: openwrt-devel@lists.openwrt.org Message-ID: <20141212135629.GA32244@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Subject: [OpenWrt-Devel] [PATCH v3 2/2] oxnas: build S-ATA driver as a module X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Daniel Golle --- package/kernel/linux/modules/block.mk | 16 ++++++++++++++++ target/linux/oxnas/Makefile | 5 +++-- target/linux/oxnas/config-3.14 | 2 -- target/linux/oxnas/config-3.18 | 2 -- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 8a84aa4..20588ac 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -116,6 +116,22 @@ endef $(eval $(call KernelPackage,ata-nvidia-sata)) +define KernelPackage/ata-oxnas-sata + TITLE:=oxnas Serial ATA support + KCONFIG:=CONFIG_SATA_OXNAS + DEPENDS:=@TARGET_oxnas + FILES:=$(LINUX_DIR)/drivers/ata/sata_oxnas.ko + AUTOLOAD:=$(call AutoLoad,41,sata_oxnas,1) + $(call AddDepends/ata) +endef + +define KernelPackage/ata-oxnas-sata/description + SATA support for OX934 core found in the OX82x/PLX782x SoCs +endef + +$(eval $(call KernelPackage,ata-oxnas-sata)) + + define KernelPackage/ata-pdc202xx-old SUBMENU:=$(BLOCK_MENU) TITLE:=Older Promise PATA controller support diff --git a/target/linux/oxnas/Makefile b/target/linux/oxnas/Makefile index e0f2d4c..e919eef 100644 --- a/target/linux/oxnas/Makefile +++ b/target/linux/oxnas/Makefile @@ -20,8 +20,9 @@ KERNEL_PATCHVER:=3.14 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ - kmod-button-hotplug kmod-input-gpio-keys-polled kmod-leds-gpio \ - kmod-usb2-oxnas uboot-envtools uboot-oxnas-ox820 + kmod-ata-core kmod-ata-oxnas-sata kmod-button-hotplug \ + kmod-input-gpio-keys-polled kmod-leds-gpio kmod-usb2-oxnas \ + uboot-envtools uboot-oxnas-ox820 KERNELNAME:=zImage dtbs diff --git a/target/linux/oxnas/config-3.14 b/target/linux/oxnas/config-3.14 index 086f870..473a2bf 100644 --- a/target/linux/oxnas/config-3.14 +++ b/target/linux/oxnas/config-3.14 @@ -25,7 +25,6 @@ CONFIG_ARM_NR_BANKS=8 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y CONFIG_ARM_UNWIND=y -CONFIG_ATA=y CONFIG_AUTO_ZRELADDR=y # CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_SD=y @@ -298,7 +297,6 @@ CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_CMOS is not set -CONFIG_SATA_OXNAS=y CONFIG_SCHED_HRTICK=y CONFIG_SCSI=y CONFIG_SERIAL_8250_NR_UARTS=1 diff --git a/target/linux/oxnas/config-3.18 b/target/linux/oxnas/config-3.18 index f66650a..56dce65 100644 --- a/target/linux/oxnas/config-3.18 +++ b/target/linux/oxnas/config-3.18 @@ -29,7 +29,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y CONFIG_ARM_UNWIND=y -CONFIG_ATA=y # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set CONFIG_AUTO_ZRELADDR=y # CONFIG_BLK_DEV_INITRD is not set @@ -316,7 +315,6 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_CMOS is not set CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SATA_OXNAS=y CONFIG_SCHED_HRTICK=y CONFIG_SCSI=y CONFIG_SERIAL_8250_NR_UARTS=1