merge of '070533cbb8f39d9306bbc120371891e171775516'

     and 'f695654d2676f4d969fd509c4b4e96172463fbe2'

8 files changed, 59 insertions, 8 deletions

diff --git a/packages/fbset/fbset-modes.bb b/packages/fbset/fbset-modes.bb
new file mode 100644
index 0000000000..1daa0e8f57
--- /dev/null
+++ b/packages/fbset/fbset-modes.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Default display timings and resolutions for fbset"
+PV = "0.1.0"
+PR = "r0"
+
+ALLOW_EMPTY = "1"
+
+SRC_URI_append_fic-gta01 = " \
+    file://fb.modes"
+
+do_install() {
+    install -d ${D}${sysconfdir}
+    install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}
+}
+
+FILES_${PN} = "${sysconfdir}/fb.modes"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_fbset-modes = "${MACHINE}"
+
diff --git a/packages/fbset/fbset-modes/.mtn2git_empty b/packages/fbset/fbset-modes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbset/fbset-modes/.mtn2git_empty
diff --git a/packages/fbset/fbset-modes/fic-gta01/.mtn2git_empty b/packages/fbset/fbset-modes/fic-gta01/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbset/fbset-modes/fic-gta01/.mtn2git_empty
diff --git a/packages/fbset/fbset-modes/fic-gta01/fb.modes b/packages/fbset/fbset-modes/fic-gta01/fb.modes
new file mode 100644
index 0000000000..446d23dd8e
--- /dev/null
+++ b/packages/fbset/fbset-modes/fic-gta01/fb.modes
@@ -0,0 +1,29 @@
+# Timings for GTA01 VGA and QVGA mode
+
+mode "480x640"
+    # D: 26.000 MHz, H: 43.334 kHz, V: 65.657 Hz
+    geometry 480 640 480 640 16
+    timings 38461 104 8 2 16 8 2
+    accel false
+endmode
+
+mode "vga"
+    # D: 26.000 MHz, H: 43.334 kHz, V: 65.657 Hz
+    geometry 480 640 480 640 16
+    timings 38461 104 8 2 16 8 2
+    accel false
+endmode
+
+mode "240x320"
+    # D: 8.475 MHz, H: 24.635 kHz, V: 75.569 Hz
+    geometry 240 320 240 320 16
+    timings 118000 88 8 2 2 8 2
+    accel false
+endmode
+
+mode "qvga"
+    # D: 8.475 MHz, H: 24.635 kHz, V: 75.569 Hz
+    geometry 240 320 240 320 16
+    timings 118000 88 8 2 2 8 2
+    accel false
+endmode
diff --git a/packages/fbset/fbset_2.1.bb b/packages/fbset/fbset_2.1.bb
index ab505110e4..9037350bad 100644
--- a/packages/fbset/fbset_2.1.bb
+++ b/packages/fbset/fbset_2.1.bb
@@ -7,6 +7,7 @@
 
 DESCRIPTION = "The fbset console tool"
 LICENSE = "GPL"
+RRECOMMENDS = "fbset-modes"
 
 PR = "r2"
 
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index 0666f226d0..3a33b2086c 100644
--- a/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -2,7 +2,7 @@
 
 DESCRIPTION = "Gstreamer package groups"
 DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r9"
+PR = "r10"
 
 PACKAGES = "\
     gst-meta-base \
@@ -20,17 +20,15 @@ RDEPENDS_gst-meta-base = "\
     gst-plugin-audioconvert \
     gst-plugin-audioresample \
     gst-plugin-typefindfunctions \
-    gst-plugin-videoscale \
     gst-plugin-autodetect"
 
 RRECOMMENDS_gst-meta-base = "\
     gst-plugin-gnomevfs \
     gst-plugin-alsa \
     gst-plugin-ximagesink \
-    gst-plugin-typefindfunctions \
     gst-plugin-videoscale \
-    gst-plugin-ffmpegcolorspace \
-    gst-plugin-autodetect"
+    gst-plugin-videorate \
+    gst-plugin-ffmpegcolorspace"
 
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
@@ -49,6 +47,9 @@ RDEPENDS_gst-meta-video = "\
     gst-meta-base \
     gst-plugin-avi \
     gst-plugin-matroska \
+    gst-plugin-mpegstream \
+    gst-plugin-mpegaudioparse \
+    gst-plugin-mpegvideoparse \
     gst-plugin-mpeg2dec"
 
 RRECOMMENDS_gst-meta-video = "\
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index db561a7f0d..7ba2556bb8 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r23"
+PR = "${EZX}-r24"
 
 require linux.inc
 
@@ -92,8 +92,8 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
 #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
 CMDLINE_CON = "console=tty1 "
 
-CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
-CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
 # Uncomment to enable dyntick
 #CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index da6c1ef36e..2df8c6c293 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -37,6 +37,8 @@ RDEPENDS_task-openmoko-linux = "\
   rsync \
   screen \
   psplash \
+  fbset \
+  fbset-modes \
 #  update-alternatives \
 "