From patchwork Fri May 25 21:07:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 161427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 82493B6EE7 for ; Sat, 26 May 2012 07:08:48 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 532438D653; Fri, 25 May 2012 21:08:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fUrXcae7VD96; Fri, 25 May 2012 21:08:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7DFB38D63A; Fri, 25 May 2012 21:08:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 728AB8F753 for ; Fri, 25 May 2012 21:08:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 630078D62C for ; Fri, 25 May 2012 21:08:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OSj4y2nDl29P for ; Fri, 25 May 2012 21:08:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 043158D572 for ; Fri, 25 May 2012 21:08:29 +0000 (UTC) Received: by wgbds1 with SMTP id ds1so7396240wgb.4 for ; Fri, 25 May 2012 14:08:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=CA5pgFJhwzjp24OGhcWYumR3PRezM2i4xdZfsNl38Mg=; b=xHNMh7Zd2lLuVi3W9QMrjJsQAt7nYXOcPT0EYzkPTtSSkha+bS/JtgFZa2Eu6L22ms WKvNfPC/JBX/0nArwqsnXbqPJWQ6sXsnUVX25UAI4WnE5i0U4os2yozqcFYwkLc57CF+ uR+e4jYYLWMsXdxxdBMfv2SCQFi3pHL9/+/wVLHMO1GJRBR7Ywh5t7A48T/PDEBhMCcn QOC8sx8uxXPwgr4KynHbrtGl+wOPSncduUDMSC/Cr4O+Nvl6+yGQmOT+gCkzw8+ys2L+ elE/1rcJcrI9gAe+V7bITnbA9K5g1OjfP8/psLjqZ2fLVFa8RPWGFpgfKz1f0d3QvF5a YKtw== Received: by 10.180.78.105 with SMTP id a9mr670645wix.14.1337980107931; Fri, 25 May 2012 14:08:27 -0700 (PDT) Received: from localhost.localdomain (host-78-150-204-81.as13285.net. [78.150.204.81]) by mx.google.com with ESMTPS id ez4sm57720653wid.3.2012.05.25.14.08.25 (version=SSLv3 cipher=OTHER); Fri, 25 May 2012 14:08:26 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Fri, 25 May 2012 22:07:21 +0100 Message-Id: <1337980041-25675-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH resend] owl-linux: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson Signed-off-by: Simon Dawson --- package/Config.in | 1 + package/owl-linux/Config.in | 18 ++++++++++++++++++ ...1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch | 15 +++++++++++++++ .../owl-linux-1.0.6-fix-for-linux-3.3.x.patch | 19 +++++++++++++++++++ package/owl-linux/owl-linux.mk | 20 ++++++++++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 package/owl-linux/Config.in create mode 100644 package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch create mode 100644 package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch create mode 100644 package/owl-linux/owl-linux.mk diff --git a/package/Config.in b/package/Config.in index fb1b08f..971b106 100644 --- a/package/Config.in +++ b/package/Config.in @@ -208,6 +208,7 @@ source "package/mtd/Config.in" source "package/ntfs-3g/Config.in" source "package/open2300/Config.in" source "package/openocd/Config.in" +source "package/owl-linux/Config.in" source "package/parted/Config.in" source "package/pciutils/Config.in" source "package/picocom/Config.in" diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in new file mode 100644 index 0000000..a5ab8e8 --- /dev/null +++ b/package/owl-linux/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OWL_LINUX + bool "H&D Wireless SPB104 SD-card WiFi SIP" + depends on BR2_LINUX_KERNEL + depends on (BR2_arm920t || BR2_arm922t || BR2_arm926t) + depends on BR2_ARM_EABI + help + Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP. + + http://linux.hd-wireless.se/bin/view/Linux/GettingStarted + +comment "owl-linux requires a Linux kernel" + depends on !BR2_LINUX_KERNEL + +comment "owl-linux is only supported on the ARM9 architecture" + depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t) + +comment "owl-linux requires the ARM EABI" + depends on !BR2_ARM_EABI diff --git a/package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch b/package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch new file mode 100644 index 0000000..a644406 --- /dev/null +++ b/package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch @@ -0,0 +1,15 @@ +Fix the owl-linux Makefile so that it protects spaces in the CROSS_COMPILE +variable. For example, this variable will contain spaces if ccache is used. + +diff -Nur a/Makefile b/Makefile +--- a/Makefile 2011-09-15 12:20:37.000000000 +0100 ++++ b/Makefile 2012-05-10 08:53:55.727706424 +0100 +@@ -35,7 +35,7 @@ + PWD := $(shell pwd) + + default: +- $(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) M=$(PWD) MODE=$(MODE) modules ++ $(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE="$(CROSS_COMPILE)" M=$(PWD) MODE=$(MODE) modules + + clean: + -rm -f *.o *.mod.c *.ko modules.order Module.symvers diff --git a/package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch b/package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch new file mode 100644 index 0000000..2d4ea48 --- /dev/null +++ b/package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch @@ -0,0 +1,19 @@ +Kernel commit b81693d9149c598302e8eb9c20cb20330d922c8e changed the +net_device_ops structure, removing the ndo_set_multicast_list callback. The +ndo_set_rx_mode has also been added to this structure. + +The upshot of these changes is that owl-linux fails to compile with 3.3.x +kernels. + +diff -Nur a/owl_net.c b/owl_net.c +--- a/owl_net.c 2011-09-15 12:20:37.000000000 +0100 ++++ b/owl_net.c 2012-05-01 11:39:14.617658349 +0100 +@@ -376,7 +376,7 @@ + #endif /* OWL_CONFIG_IFUPDOWN */ + .ndo_start_xmit = owl_net_tx, + .ndo_get_stats = owl_net_get_stats, +- .ndo_set_multicast_list = NULL, ++ .ndo_set_rx_mode = NULL, + .ndo_tx_timeout = owl_net_tx_timeout, + .ndo_set_mac_address = NULL, + }; diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk new file mode 100644 index 0000000..8aa8709 --- /dev/null +++ b/package/owl-linux/owl-linux.mk @@ -0,0 +1,20 @@ +############################################################# +# +# owl-linux +# +############################################################# +OWL_LINUX_VERSION = 1.0.6 +OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers +OWL_LINUX_SOURCE = owl-linux-$(OWL_LINUX_VERSION).tar.gz + +OWL_LINUX_DEPENDENCIES = linux + +define OWL_LINUX_BUILD_CMDS + $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR) +endef + +define OWL_LINUX_INSTALL_TARGET_CMDS + $(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M="$(@D)" modules_install +endef + +$(eval $(call GENTARGETS))