linux-oz-2.6: Tosa updates from Dirk bringingTosa up to date

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0141eb5..7008ce9 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -126,6 +126,7 @@ TMPDIR = "${TOPDIR}/tmp"
 CACHE = "${TMPDIR}/cache"
 DL_DIR = "${TMPDIR}/downloads"
 CVSDIR = "${DL_DIR}/cvs"
+GITDIR = "${DL_DIR}/git"
 
 STAMP = "${TMPDIR}/stamps/${PF}"
 WORKDIR = "${TMPDIR}/work/${PF}"

diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf
index 8a75203..d21c609 100644 (file)
--- a/conf/machine/tosa-2.6.conf
+++ b/conf/machine/tosa-2.6.conf
@@ -1,10 +1,14 @@
 include conf/machine/zaurus-clamshell-2.6.conf
 # SOUND Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-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"
-
-# WM9712 Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
+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_wm97xx = "wm97xx"
 module_autoload_snd-pcm-oss ="snd-pcm-oss"
+
+# 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"