summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-26 11:30:44 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-26 11:30:44 +0000
commit98cc181f6b4477bbe8ef52c2a8bff5ff9ccd6a23 (patch)
tree89c9cfb624b8672448b30e51911b50e0479cb374
parent33ebd14045389534271f051904f26ebad97a0bd0 (diff)
downloadpoky-98cc181f6b4477bbe8ef52c2a8bff5ff9ccd6a23.tar.gz
prism-firmware: sync with OE (usage of 1.7.4 firmware and other fixes)
Revision: a5a7ee9814548b1e054d96cea845556c4b5c39e9 Author: xora@openembedded.org Date: 2007-09-03T14:18:11 Branch: org.openembedded.dev ChangeLog: misc-binary-only/prism-firmware.bb : use non broken prism firmware. This should ease the connection problems people reported with 1.8.4 and improve kismetting ----------------------------------------------------------------- Revision: a72b36a49416a98cb1f4a0ef9132181b0d28c6cb Author: xora@openembedded.org Date: 2007-06-29T08:28:48 Branch: org.openembedded.dev ChangeLog: prism-firmware.bb : remove if around secondary firmware download as we always want to do this and logic as presented prevented download on flashless cards. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2995 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/misc-binary-only/prism-firmware.bb14
-rw-r--r--meta/packages/misc-binary-only/prism-firmware/prism-fw.sh7
2 files changed, 11 insertions, 10 deletions
diff --git a/meta/packages/misc-binary-only/prism-firmware.bb b/meta/packages/misc-binary-only/prism-firmware.bb
index 4b18d865da..903c55e15e 100644
--- a/meta/packages/misc-binary-only/prism-firmware.bb
+++ b/meta/packages/misc-binary-only/prism-firmware.bb
@@ -5,22 +5,24 @@ RDEPENDS = "hostap-utils"
5RREPLACES = "prism3-firmware prism3-support" 5RREPLACES = "prism3-firmware prism3-support"
6RCONFLICTS = "prism3-firmware prism3-support" 6RCONFLICTS = "prism3-firmware prism3-support"
7PACKAGE_ARCH = "all" 7PACKAGE_ARCH = "all"
8PR = "r1" 8PR = "r3"
9 9
10SRC_URI = "http://www.red-bean.com/~proski/firmware/Latest-prism.tar.bz2 \ 10SRC_URI = "http://www.red-bean.com/~proski/firmware/primary.tar.bz2 \
11 http://www.red-bean.com/~proski/firmware/1.7.4.tar.bz2 \
11 file://prism-fw.sh \ 12 file://prism-fw.sh \
12 file://hostap.rules" 13 file://hostap.rules"
13 14
14S = "${WORKDIR}/Latest-prism/"
15
16do_install() { 15do_install() {
17 install -d ${D}${base_libdir}/firmware/ 16 install -d ${D}${base_libdir}/firmware/
18 install -d ${D}${base_libdir}/udev/ 17 install -d ${D}${base_libdir}/udev/
19 install -d ${D}${sysconfdir}/pcmcia/ 18 install -d ${D}${sysconfdir}/pcmcia/
20 install -d ${D}${sysconfdir}/udev/rules.d/ 19 install -d ${D}${sysconfdir}/udev/rules.d/
21 20
22 install -m 0644 primary-RAM/*.hex ${D}${base_libdir}/firmware/ 21 install -m 0644 ${WORKDIR}/primary/af010104.hex ${D}${base_libdir}/firmware/
23 install -m 0644 secondary-RAM/rf010804.hex ${D}${base_libdir}/firmware/ 22 install -m 0644 ${WORKDIR}/primary/ak010104.hex ${D}${base_libdir}/firmware/
23 install -m 0644 ${WORKDIR}/primary/pm010102.hex ${D}${base_libdir}/firmware/
24
25 install -m 0644 ${WORKDIR}/1.7.4/rf010704.hex ${D}${base_libdir}/firmware/
24 26
25 install -m 0755 ${WORKDIR}/prism-fw.sh ${D}${base_libdir}/udev/ 27 install -m 0755 ${WORKDIR}/prism-fw.sh ${D}${base_libdir}/udev/
26 install -m 0644 ${WORKDIR}/hostap.rules ${D}${sysconfdir}/udev/rules.d/ 28 install -m 0644 ${WORKDIR}/hostap.rules ${D}${sysconfdir}/udev/rules.d/
diff --git a/meta/packages/misc-binary-only/prism-firmware/prism-fw.sh b/meta/packages/misc-binary-only/prism-firmware/prism-fw.sh
index c58600791c..619f612be1 100644
--- a/meta/packages/misc-binary-only/prism-firmware/prism-fw.sh
+++ b/meta/packages/misc-binary-only/prism-firmware/prism-fw.sh
@@ -4,7 +4,7 @@ CARD_ID=`/usr/sbin/hostap_diag $INTERFACE|grep NICID|awk '{print $2}'|sed -e 's/
4 4
5# 801d cards lack even Primary firmware so we cannot use hostap_diag 5# 801d cards lack even Primary firmware so we cannot use hostap_diag
6PRI=/lib/firmware/pm010102.hex 6PRI=/lib/firmware/pm010102.hex
7STA=/lib/firmware/rf010804.hex 7STA=/lib/firmware/rf010704.hex
8 8
9if [ $CARD_ID = '800c' ] || [ $CARD_ID = '8013' ] || [ $CARD_ID = '8017' ] || \ 9if [ $CARD_ID = '800c' ] || [ $CARD_ID = '8013' ] || [ $CARD_ID = '8017' ] || \
10 [ $CARD_ID = '801b' ] || [ $CARD_ID = '8022' ] || [ $CARD_ID = '8023' ] ; then 10 [ $CARD_ID = '801b' ] || [ $CARD_ID = '8022' ] || [ $CARD_ID = '8023' ] ; then
@@ -28,6 +28,5 @@ if grep -q no_pri=1 $DIR/debug; then
28 /usr/sbin/prism2_srec -gp wlan0 $PRI 28 /usr/sbin/prism2_srec -gp wlan0 $PRI
29fi 29fi
30 30
31if grep -q pri_only=0 $DIR/debug; then 31/usr/sbin/prism2_srec -rp wlan0 $STA
32 /usr/sbin/prism2_srec -rp wlan0 $STA 32
33fi