oe/conf updates from Openembedded

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

7 files changed, 31 insertions, 17 deletions

diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
index 58e36c5036..8fbcbefa4b 100644
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -68,3 +68,4 @@ include conf/distro/preferred-gpe-versions-2.7.inc
 # E
 #
 #include conf/distro/preferred-e-versions.inc
+
diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc
index ff608f28f2..d9f65b3831 100644
--- a/openembedded/conf/distro/preferred-opie-versions.inc
+++ b/openembedded/conf/distro/preferred-opie-versions.inc
@@ -68,6 +68,7 @@ PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
@@ -83,6 +84,7 @@ PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
diff --git a/openembedded/conf/machine/handheld-common.conf b/openembedded/conf/machine/handheld-common.conf
index 2445ee17a6..dab1d01e70 100644
--- a/openembedded/conf/machine/handheld-common.conf
+++ b/openembedded/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
 "
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index b9925852e5..626b5cf218 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -17,9 +17,9 @@ ROOT_FLASH_SIZE = "80"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
-PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
+PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
                   snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
-                  nls_cp437 nls_utf8"
+                  nls_cp437 nls_iso8859-1 nls_utf8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -27,15 +27,15 @@ include conf/machine/ipaq-common.conf
 include conf/machine/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed" 
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim" 
+GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/tune-xscale.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
+                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
@@ -45,9 +45,9 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_hx4700_ts = "hx4700_ts"
 module_autoload_hx4700_navpt = "hx4700_navpt"
 module_autoload_hx4700_bt = "hx4700_bt"
-module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
+module_autoload_snd-hx4700_audio = "snd-hx4700_audio"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-pcm-oss = "snd-mixer-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
 
 #FIXME: this should be controlled by a userspace utility later.
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index 79ce0c4193..9a53e8f1a9 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -13,7 +13,7 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
 BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 
diff --git a/openembedded/conf/machine/tune-arm926ejs.conf b/openembedded/conf/machine/tune-arm926ejs.conf
index 5374c55dcc..5e2f6b7c62 100644
--- a/openembedded/conf/machine/tune-arm926ejs.conf
+++ b/openembedded/conf/machine/tune-arm926ejs.conf
@@ -1,3 +1,3 @@
-#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
-TARGET_CC_ARCH = "-march=armv5te"
+#if gcc breaks change arm926ejs to arm926ej-s
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 PACKAGE_ARCH = "armv5te"
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
index 7438e8f998..757fc6acf3 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf
@@ -3,13 +3,13 @@
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 
-BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw orinoco-conf \
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \
 pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl"
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs spectrum-fw \
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl"
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
 
 # Ethernet modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
@@ -34,4 +34,15 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage
                              kernel-module-g-serial kernel-module-g-ether"
 
 # Wireless Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-orinoco-cs kernel-module-spectrum-cs"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
+                             kernel-module-hermes kernel-module-orinoco \
+                             kernel-module-orinoco-cs kernel-module-spectrum-cs"
+
+# 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 \
+                             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 "