Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "meta-digi-arm: Avoid udev loading firmware files for atheros." 

This manually reverts commit ecfdf6ae23.

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>
This commit is contained in:
Alex Gonzalez 2013-05-10 17:29:35 +02:00
parent 2a1efb61a0
commit d176828980
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/recipes-kernel/kernel-module-atheros/files/50-firmware.rules
View File

@ -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}"

15
meta-digi-arm/recipes-kernel/kernel-module-atheros/files/firmware.sh
View File

@ -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

7
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
View File

@ -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 \