From d17682898017570caa7d8a1aa2f00a82a723e456 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Fri, 10 May 2013 17:29:35 +0200
Subject: [PATCH] Revert "meta-digi-arm: Avoid udev loading firmware files for
 atheros."

This manually reverts commit ecfdf6ae2329c12857f848a854f78096a8b1810e.

Once mdev was removed as a dependency from del-image-graphical, we need
udev to load the firmware files for the wireless drivers. This job was
being done by mdev.

The reason for the commit in the first place was that both mdev and udev
were attempting to load the firmware files, so we changed the udev
rule to ignore the atheros driver. This was only needed when mdev and
udev were both running.

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

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../kernel-module-atheros/files/50-firmware.rules |  4 ----
 .../kernel-module-atheros/files/firmware.sh       | 15 ---------------
 .../kernel-module-atheros.bb                      |  7 -------
 3 files changed, 26 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-kernel/kernel-module-atheros/files/50-firmware.rules
 delete mode 100755 meta-digi-arm/recipes-kernel/kernel-module-atheros/files/firmware.sh

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/50-firmware.rules b/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/50-firmware.rules
deleted file mode 100644
index e809e246e..000000000
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/50-firmware.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# firmware-class requests, copies files into the kernel
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh $env{FIRMWARE} $env{DEVPATH}"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/firmware.sh b/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/firmware.sh
deleted file mode 100755
index 11fbe56ba..000000000
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/files/firmware.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -l
-
-set -e
-
-FIRMWARE=$1
-DEVPATH=$2
-
-if echo "${FIRMWARE}" | egrep -q "ath6k" ; then 
-	/bin/echo "Refusing to load ${FIRMWARE}."
-else
-	/bin/echo "Loading ${FIRMWARE}"
-	/lib/udev/firmware --firmware=${FIRMWARE} --devpath=${DEVPATH}
-fi
-
-
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 390ba8486..06a8845e8 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
@@ -23,10 +23,8 @@ SRC_URI_tar = "${DIGI_MIRROR}/atheros-${SRCREV_SHORT}.tar.gz;md5sum=${TARBALL_MD
 
 SRC_URI  = "${@base_conditional('ATHEROS_BUILD_FROM_GIT', '1' , '${SRC_URI_git}', '${SRC_URI_tar}', d)}"
 SRC_URI += " \
-	file://50-firmware.rules \
 	file://atheros \
 	file://atheros.conf \
-	file://firmware.sh \
 	file://Makefile \
 	"
 
@@ -43,10 +41,6 @@ do_install_append() {
 	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/
-	install -d ${D}${sysconfdir}/udev/rules.d
-	install -m 0644 ${WORKDIR}/50-firmware.rules ${D}${sysconfdir}/udev/rules.d/
-	install -d ${D}${base_libdir}/udev
-	install -m 0755 ${WORKDIR}/firmware.sh ${D}${base_libdir}/udev/
 }
 
 FILES_${PN} += " \
@@ -57,7 +51,6 @@ FILES_${PN} += " \
 	/lib/firmware/ath6k/AR6003/hw2.1.1/fw-4.bin \
 	/lib/firmware/ath6k/AR6003/hw2.1.1/nullTestFlow.bin \
 	/lib/firmware/ath6k/AR6003/hw2.1.1/utf.bin \
-	/lib/udev/firmware.sh \
 	"
 FILES_${PN}_append_cpx2 = " \
 	/lib/firmware/ath6k/AR6003/hw2.1.1/calData_AR6103_Digi_X2e_B.bin \