From 936fcc9151434771039bc32ebda2a20932bd97de Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 13 Sep 2013 18:40:10 +0200
Subject: [PATCH] atheros: rework to build with linux 3.10

https://jira.digi.com/browse/DEL-673

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../kernel-module-atheros/kernel-module-atheros.bb | 14 ++++++--------
 .../kernel-module-atheros/Makefile                 |  4 ----
 .../kernel-module-atheros/atheros.conf             |  1 -
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
index 611b24b21..53d6d4b95 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
@@ -13,7 +13,7 @@ PR = "r1"
 RDEPENDS_${PN} = "kmod"
 
 SRCREV_external = ""
-SRCREV_internal = "ac3a910ebc66d0eca8f4de78b513fa3636ed9e6b"
+SRCREV_internal = "b17616e7d69cfc6f838daa5477403d9e9c4bc997"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/atheros.git;protocol=git"
@@ -21,16 +21,12 @@ SRC_URI_internal = "${DIGI_LOG_GIT}linux-modules/atheros.git;protocol=git"
 SRC_URI  = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
     file://atheros \
-    file://atheros.conf \
     file://Makefile \
 "
 
 S = "${WORKDIR}/git"
 
-ATH_ONLY_INSTALL_FW = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-dey', '2.6.35.14', '', '1', d)}"
-ATH6KL_MOD = "${@base_conditional('ATH_ONLY_INSTALL_FW', '1' , 'ath6kl_core', 'ath6kl_sdio', d)}"
-
-EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR} ATH_ONLY_INSTALL_FW=${ATH_ONLY_INSTALL_FW}"
+EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR}"
 
 do_configure_prepend() {
 	cp ${WORKDIR}/Makefile ${S}/
@@ -40,8 +36,10 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/network/if-pre-up.d
 	install -m 0755 ${WORKDIR}/atheros ${D}${sysconfdir}/network/if-pre-up.d/
 	install -d ${D}${sysconfdir}/modprobe.d
-	install -m 0644 ${WORKDIR}/atheros.conf ${D}${sysconfdir}/modprobe.d/
-	echo "options ${ATH6KL_MOD} ath6kl_p2p=1 softmac_enable=1" >> ${D}${sysconfdir}/modprobe.d/atheros.conf
+	cat >> ${D}${sysconfdir}/modprobe.d/atheros.conf <<-_EOF_
+		install ath6kl_sdio true
+		options ath6kl_sdio ath6kl_p2p=1 softmac_enable=1
+	_EOF_
 }
 
 FILES_${PN} += " \
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile
index d90116ccc..93dfd19b1 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile
+++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/Makefile
@@ -44,18 +44,14 @@ endif
 SRC := $(shell pwd)
 
 all:
-ifeq ($(ATH_ONLY_INSTALL_FW),)
 	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)
-endif
 
 modules_install:
-ifeq ($(ATH_ONLY_INSTALL_FW),)
 	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install
 	# Fix installation directory of the modules.
 	find $(INSTALL_MOD_PATH)/lib/modules/$(KERNEL_VERSION)/extra/$(ATH_DRV_BASEDIR) -type f -name '*.ko' | \
 		xargs -I modfile mv -f modfile $(INSTALL_MOD_PATH)/lib/modules/$(KERNEL_VERSION)/extra/
 	rm -rf $(INSTALL_MOD_PATH)/lib/modules/*/extra/$(ATH_DRV_BASEDIR)
-endif
 	# Install firmware
 	mkdir -p $(INSTALL_MOD_PATH)/lib/firmware/ath6k/AR6003/hw2.1.1/
 	install -m 0644 $(FIRMWARE) $(INSTALL_MOD_PATH)/lib/firmware/ath6k/AR6003/hw2.1.1/
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf
deleted file mode 100644
index 81b9b1bcd..000000000
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros.conf
+++ /dev/null
@@ -1 +0,0 @@
-install ath6kl_sdio true