[oe-commits] Martin Jansa : om-gta0(1|2): sync with oe.dev

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 37d13bcac184179abcca26fd91f5f74b162f997f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=37d13bcac184179abcca26fd91f5f74b162f997f

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov 18 11:45:57 2009 +0100

om-gta0(1|2): sync with oe.dev

---

 conf/machine/om-gta01.conf |    3 +--
 conf/machine/om-gta02.conf |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 234c1b9..5bdeba0 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -47,9 +47,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 # used by some images
 ROOT_FLASH_SIZE = "60"
 
-IMAGE_FSTYPES ?= "jffs2"
-
 # extra jffs2 tweaks
+IMAGE_FSTYPES += "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # build / upload tools
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index d6e2f6e..5882019 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -6,8 +6,8 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 # If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
 PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"