[oe-commits] Martin Jansa : linux-openmoko: use add module_autoload for 2.6.31, add ppp_generic and load snd modules from machine configs

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 4c28b1df18d0c31e841b98274db0c22e6f032c43
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4c28b1df18d0c31e841b98274db0c22e6f032c43

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Dec  2 13:54:56 2009 +0100

linux-openmoko: use add module_autoload for 2.6.31, add ppp_generic and load snd modules from machine configs

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/om-gta02.conf       |    2 ++
 recipes/images/shr-image.inc     |    6 ------
 recipes/linux/linux-openmoko.inc |    8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 8e8355b..c65d971 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -83,6 +83,8 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+#2.6.31 is using the same name as it was in gta01
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index ac20537..bbda84d 100644
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -98,12 +98,6 @@ shr_rootfs_postprocess() {
     #set up a nice gentoo-like PS1
     echo "export PS1=\"\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] \"">> ./etc/profile
 
-    #load modules on boot
-    [ -d ./etc/modutils ] || mkdir ./etc/modutils
-    # FIXME: do load those modules through module_autoload in 
-    # machine config or distro config
-    echo "ppp_generic" > ./etc/modutils/ppp_generic
-
     #set up some variables to improve default settings
     echo "if [ \"\$DISPLAY\" = \"\" ]" >> ./etc/profile
     echo "then" >> ./etc/profile
diff --git a/recipes/linux/linux-openmoko.inc b/recipes/linux/linux-openmoko.inc
index e789e76..99865c9 100644
--- a/recipes/linux/linux-openmoko.inc
+++ b/recipes/linux/linux-openmoko.inc
@@ -28,12 +28,8 @@ THUMB_INTERWORKING = "no"
 module_autoload_ohci-hcd = "ohci-hcd"
 module_autoload_hci_usb = "hci_usb"
 module_autoload_g_ether = "g_ether"
-# audio (GTA01)
-module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
-# audio (GTA02)
-module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
-# audio (GTA03)
-module_autoload_snd-soc-neo1973-gta03-wm8753 = ""
+module_autoload_ppp_generic = "ppp_generic"
+# snd modules module_autoload_snd-soc-neo1973-*-wm8753 are in machine.conf 
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"