Sync conf files with OE - includes adding zaurusd to images and fixing PCMCIA_MANAGER handling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@327 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 20 insertions, 24 deletions

diff --git a/openembedded/conf/machine/include/handheld-common.conf b/openembedded/conf/machine/include/handheld-common.conf
index 467d5e59f1..f8767d2ddf 100644
--- a/openembedded/conf/machine/include/handheld-common.conf
+++ b/openembedded/conf/machine/include/handheld-common.conf
@@ -7,7 +7,7 @@ ide-cs ide-disk ide-probe-mod \
 loop \
 vfat ext2 \
 sunrpc nfs \
-btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
+btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \
 pcnet-cs serial-cs airo-cs \
 af_packet \
 ppp-async ppp-deflate ppp-mppe \
@@ -16,8 +16,6 @@ irda irlan irnet irport irtty ircomm-tty \
 input uinput \
 "
 
-PCMCIA_MANAGER ?= "pcmcia-cs"
-
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
diff --git a/openembedded/conf/machine/include/tosa-2.6.conf b/openembedded/conf/machine/include/tosa-2.6.conf
index fdd706d093..c7805c36fe 100644
--- a/openembedded/conf/machine/include/tosa-2.6.conf
+++ b/openembedded/conf/machine/include/tosa-2.6.conf
@@ -1,14 +1,6 @@
 include conf/machine/include/zaurus-clamshell-2.6.conf
-# SOUND Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore"
-
-module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
-module_autoload_snd-pcm-oss ="snd-pcm-oss"
+# wlan-ng Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
 
 # WM97xx Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
-module_autoload_wm9705 = "wm9705"
-#module_autoload_pxa-wm97xx = "pen_int=0"
-
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
-#module_autoload_wm97xx = "wm97xx"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
index 184258c8b6..af66c7294e 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -42,3 +42,4 @@ BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-u
                                            kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
                                            kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
 
+GPE_EXTRA_INSTALL += "chkhinge"
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
index 271a6ca3e7..e73028d7ee 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -2,10 +2,13 @@
 # Don't forget to include zaurus-clamshell.conf as well
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+
+PCMCIA_MANAGER ?= "pcmciautils"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
 
 # Ethernet modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
@@ -36,10 +39,12 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
                              hostap-conf orinoco-conf"
 
 # Sound Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
-                             kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
+                             kernel-module-snd-pcm  \
                              kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
+                             
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
diff --git a/openembedded/conf/machine/include/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
index ec10cd5e4e..2a174288b1 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te c7x0"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
@@ -12,7 +12,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
                    ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 include conf/machine/include/handheld-common.conf