diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
| commit | cbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch) | |
| tree | f7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/packages/pcmcia-cs/files | |
| parent | 562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff) | |
| download | openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2 openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip | |
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/pcmcia-cs/files')
| -rw-r--r-- | openembedded/packages/pcmcia-cs/files/arm/pcmcia | 21 | ||||
| -rw-r--r-- | openembedded/packages/pcmcia-cs/files/network.conf | 7 |
2 files changed, 19 insertions, 9 deletions
diff --git a/openembedded/packages/pcmcia-cs/files/arm/pcmcia b/openembedded/packages/pcmcia-cs/files/arm/pcmcia index d42bc84e77..05b381a5f9 100644 --- a/openembedded/packages/pcmcia-cs/files/arm/pcmcia +++ b/openembedded/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/openembedded/packages/pcmcia-cs/files/network.conf b/openembedded/packages/pcmcia-cs/files/network.conf index b35ec5c0fe..51a38dd55b 100644 --- a/openembedded/packages/pcmcia-cs/files/network.conf +++ b/openembedded/packages/pcmcia-cs/files/network.conf @@ -3,4 +3,11 @@ manfid 0x0149, 0xc1ab version "Fast Ethernet", "CF Size PC Card", "1.0" bind "pcnet_cs" +card "Hawking 10/100 CF Fast Ethernet" + manfid 0x0149, 0xc1ab + bind "pcnet_cs" +card "Billionton CFLA-100N 10/100 FastEthernet" + version "CF", "100Base-Ethernet", "V", "1.0" + manfid 0x021b, 0x0202 + bind "pcnet_cs" |