fic-gta0[0|1].conf: move recommendation of alsa-state(s) from task-openmoko to machin...

diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index b166305..bdfc3a6 100644 (file)
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -26,7 +26,10 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  alsa-state"
+  \
+  alsa-state \
+  alsa-states \
+"
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
 #SERIAL_CONSOLE = "115200 ttySAC0"

diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index a946f49..de6de24 100644 (file)
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -21,7 +21,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-ext2 \
-  alsa-state"
+  kernel-module-vfat \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-smdk2440 \
+  kernel-module-nls-iso8859-1 \
+  kernel-module-nls-cp437 \
+  \
+  alsa-state \
+  alsa-states \
+"
 
 SERIAL_CONSOLE = "115200 ttySAC2"
 

diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 07dea37..8ef66b6 100644 (file)
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r47"
+PR = "r49"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -169,7 +169,6 @@ RDEPENDS_task-openmoko-examples = "\
 #
 DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
 RDEPENDS_task-openmoko-debug = "\
-  alsa-state \
   alsa-utils-amixer \
   alsa-utils-aplay \
   alsa-utils-aconnect \