summaryrefslogtreecommitdiff
path: root/packages/pcmcia-cs
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-09-22 18:40:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-22 18:40:30 +0000
commit8eafb65a0941d5a695dedfd06416b4f197cbdb76 (patch)
treeb14887936acc17d2bf26cd24fa54de2264f8b055 /packages/pcmcia-cs
parent39a883f9a0f74d9c33f7f9f72bf497264265c97d (diff)
packages/pcmcia-cs/: apply patches from #287
Diffstat (limited to 'packages/pcmcia-cs')
-rw-r--r--packages/pcmcia-cs/files/arm/pcmcia21
-rw-r--r--packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch13
2 files changed, 17 insertions, 17 deletions
diff --git a/packages/pcmcia-cs/files/arm/pcmcia b/packages/pcmcia-cs/files/arm/pcmcia
index d42bc84e77..05b381a5f9 100644
--- a/packages/pcmcia-cs/files/arm/pcmcia
+++ b/packages/pcmcia-cs/files/arm/pcmcia
@@ -1,12 +1,19 @@
+module_id() {
+ awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+
case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
*XScale-PXA2*)
case "`uname -r`" in
2.4*)
PCIC=pxa_cs
+ DS=ds
;;
2.6*)
PCIC=pxa2xx_core
+ DS=pcmcia
;;
esac
;;
@@ -19,12 +26,8 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
;;
esac
-if grep -q iPAQ /proc/cpuinfo; then
- case `module_id` in
- "HP iPAQ H2200")
- ;;
- *)
- PCIC_EXTRA=h3600_generic_sleeve
- ;;
- esac
-fi
+case `module_id` in
+ "HP iPAQ H3"* | "HP iPAQ H5"*)
+ PCIC_EXTRA=h3600_generic_sleeve
+ ;;
+esac
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
index e78d0c5c6b..541c4edf71 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch
@@ -1,14 +1,11 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
--- pcmcia-cs-3.2.8/etc/rc.pcmcia~pcic-extra
+++ pcmcia-cs-3.2.8/etc/rc.pcmcia
-@@ -105,10 +105,16 @@
+@@ -104,11 +104,17 @@ for x in "1" ; do
+ (/sbin/modprobe yenta_socket >/dev/null 2>&1 &&
echo "using yenta_socket instead of $PCIC") ||
/sbin/modprobe $PCIC $PCIC_OPTS || break
- /sbin/modprobe ds || break
+- /sbin/modprobe ds || break
++ /sbin/modprobe $DS || break
+ if [ "x$PCIC_EXTRA" != "x" ]; then
+ /sbin/modprobe $PCIC_EXTRA
+ fi
@@ -22,7 +19,7 @@
else
echo "module directory $PC not found."
break
-@@ -154,7 +160,7 @@
+@@ -154,7 +160,7 @@ for x in "1" ; do
;;
status)