h4000, htcblueangel: Add pcmciautils to MACHINE_EXTRA.

* These machines have ACX100 internally connected to PCMCIA, and now
there's proper CardServices driver for it. At least while it is in debugging
phase, it is beneficial to have pcmciautils around. Don't pcmcia to
MACHINE_FEATURES, as the meaning of that is machine having full-fledges
PCMCIA support, and leads to installation of several additiona packages
which won't useful in this case.

diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index cd6a6dd..5aeab89 100644 (file)
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget  screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
 # Software/packages selection
@@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
                              kernel-module-i2c-pxa \
                              kernel-module-acx \

diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 77bb0b5..5f28148 100644 (file)
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-MACHINE_EXTRA_RDEPENDS = "acx-firmware"
+MACHINE_EXTRA_RDEPENDS = "acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-blueangel_pcmcia \
                             kernel-module-blueangel_audio \
                             kernel-module-blueangel_rom \