From patchwork Fri Jul 20 09:52:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 172191 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 B341A2C035F for ; Fri, 20 Jul 2012 19:53:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E1F878FFE2; Fri, 20 Jul 2012 09:53:50 +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 6NrioA2aC8uP; Fri, 20 Jul 2012 09:53:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A55FA8FFB6; Fri, 20 Jul 2012 09:53:46 +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 470908F75B for ; Fri, 20 Jul 2012 09:53:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B53F8FFB6 for ; Fri, 20 Jul 2012 09:53:44 +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 vDPZj16Dpgme for ; Fri, 20 Jul 2012 09:53:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4B6A88FCD4 for ; Fri, 20 Jul 2012 09:53:42 +0000 (UTC) Received: by weyx43 with SMTP id x43so4867702wey.16 for ; Fri, 20 Jul 2012 02:53:40 -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=cemSSTqIUT7lKlGve0KmQzk+6G9LAW0kSNWiX5j6kGo=; b=ROgZ01wNrwGRUsfNi33qk9DSi5E5//OOwQxuBCsNYA1go3T9CsnsvZ7SK/u/mdcmda 7rfxvMxBNQLrgbbwdb8KPukBvTnu895sEvS1gvGJtNa9FdaEdMQjaBbo6Z9qllnYUbBH blcpOz0coCsDzHG3/ok4Uln14HprwQADroXtFxdUfmdv+jA2aiXjMnFbYGYmCyOZK8oJ oy5kdbkEdGZVcbHLDJgwg53iYVnUVepVOtajs9FvJA/zQXVTWR/mVnfFZ1UOUovfzkHD EyMxowUcd8a7O+0u81+Vj0AYiZQv/z8jm9glyWuabqNi7I48P7wPJElfLW68Hmr39/Np Y3LQ== Received: by 10.217.83.19 with SMTP id b19mr955809wez.95.1342778020201; Fri, 20 Jul 2012 02:53:40 -0700 (PDT) Received: from localhost.localdomain (host-2-100-182-54.as13285.net. [2.100.182.54]) by mx.google.com with ESMTPS id e43sm12914073eep.4.2012.07.20.02.53.37 (version=SSLv3 cipher=OTHER); Fri, 20 Jul 2012 02:53:38 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Fri, 20 Jul 2012 10:52:33 +0100 Message-Id: <1342777953-31144-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH resend v3] 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 --- v3: Bumped version to 1.0.7. v2: Added Signed-off-by lines to patches, make configuration menu commentary less intrusive for non-ARM setups. package/Config.in | 1 + package/owl-linux/Config.in | 17 +++++++++++++++ ...linux-fix-CROSS_COMPILE-usage-in-Makefile.patch | 16 ++++++++++++++ .../owl-linux/owl-linux-fix-for-linux-3.3.x.patch | 23 ++++++++++++++++++++ package/owl-linux/owl-linux.mk | 19 ++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 package/owl-linux/Config.in create mode 100644 package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch create mode 100644 package/owl-linux/owl-linux-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 d0daa18..557f007 100644 --- a/package/Config.in +++ b/package/Config.in @@ -216,6 +216,7 @@ source "package/ntfs-3g/Config.in" source "package/ofono/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..ce677b2 --- /dev/null +++ b/package/owl-linux/Config.in @@ -0,0 +1,17 @@ +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 + depends on BR2_arm || BR2_armeb + +comment "owl-linux is only supported on ARM9 architecture with EABI" + depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t) || !BR2_ARM_EABI + depends on BR2_arm || BR2_armeb diff --git a/package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch b/package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch new file mode 100644 index 0000000..14b4631 --- /dev/null +++ b/package/owl-linux/owl-linux-fix-CROSS_COMPILE-usage-in-Makefile.patch @@ -0,0 +1,16 @@ +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. + +Signed-off-by: Simon Dawson +diff -Nurp a/Makefile b/Makefile +--- a/Makefile 2012-06-14 10:51:45.000000000 +0100 ++++ b/Makefile 2012-07-20 10:46:41.636752148 +0100 +@@ -35,7 +35,7 @@ else + 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-fix-for-linux-3.3.x.patch b/package/owl-linux/owl-linux-fix-for-linux-3.3.x.patch new file mode 100644 index 0000000..e807de2 --- /dev/null +++ b/package/owl-linux/owl-linux-fix-for-linux-3.3.x.patch @@ -0,0 +1,23 @@ +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 +and later kernels. + +Signed-off-by: Simon Dawson +diff -Nurp a/owl_net.c b/owl_net.c +--- a/owl_net.c 2012-06-14 10:51:45.000000000 +0100 ++++ b/owl_net.c 2012-07-20 10:46:55.332751539 +0100 +@@ -384,7 +384,11 @@ static const struct net_device_ops netde + #endif /* OWL_CONFIG_IFUPDOWN */ + .ndo_start_xmit = owl_net_tx, + .ndo_get_stats = owl_net_get_stats, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) + .ndo_set_multicast_list = NULL, ++#else ++ .ndo_set_rx_mode = NULL, ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */ + .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..0a111c8 --- /dev/null +++ b/package/owl-linux/owl-linux.mk @@ -0,0 +1,19 @@ +############################################################# +# +# owl-linux +# +############################################################# +OWL_LINUX_VERSION = 1.0.7 +OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers + +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 $(generic-package))