diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-07-10 15:39:24 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-10 15:39:24 +0000 |
| commit | 4c0c07d55cf2790fe9967c23719abb7aa15ed143 (patch) | |
| tree | 5dd833ae59ef14a0beefbebc94dbe4dc2e0f5a28 | |
| parent | 54e1ebf1061d87fb139645426d008f97a97a6c21 (diff) | |
fic-gta0[0|1].conf: move recommendation of alsa-state(s) from task-openmoko to machine configuration
| -rw-r--r-- | conf/machine/fic-gta01.conf | 7 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 12 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index b16630510e..bdfc3a6f47 100644 --- 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 a946f49c4f..de6de24ec1 100644 --- 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 07dea3752c..8ef66b6080 100644 --- 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 \ |