[oe-commits] Thomas Zimmermann : shr/merge: update om-gta02.conf

[git version control]

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

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Mon Oct 12 16:04:40 2009 +0000

shr/merge: update om-gta02.conf

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/shr-autorev-unstable.inc |    2 --
 conf/distro/include/shr-autorev.inc          |    1 -
 conf/machine/om-gta02.conf                   |   12 +++++-------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index 27c70f7..5ae13b8 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -136,8 +136,6 @@ SRCREV_pn-openmoocow = "${AUTOREV}"
 SRCREV_pn-libmokoui2 = "4695"
 SRCREV_pn-intone = "${AUTOREV}"
 SRCREV_pn-intone-video = "${AUTOREV}"
-#SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
-SRCREV_pn-connman = "039571c9db317fa8f63c4d1cc6210506c0d9deb5"
 SRCREV_pn-msn-pecan = "${AUTOREV}"
 SRCREV_pn-omgps = "${AUTOREV}"
 SRCREV_pn-shr-today = "${AUTOREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index be0025f..c8de11a 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -137,7 +137,6 @@ SRCREV_pn-openmoocow = "${AUTOREV}"
 SRCREV_pn-libmokoui2 = "4695"
 SRCREV_pn-intone = "${AUTOREV}"
 SRCREV_pn-intone-video = "${AUTOREV}"
-SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
 SRCREV_pn-msn-pecan = "${AUTOREV}"
 SRCREV_pn-omgps = "${AUTOREV}"
 SRCREV_pn-shr-today = "${AUTOREV}"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 94ca294..ca45ddf 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-2.6.28"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
@@ -15,10 +15,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-xorg \
-           xf86-input-tslib \
-           xf86-video-glamo \
-           xf86-input-keyboard"
+XSERVER ?= "xserver-kdrive-glamo xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
@@ -33,7 +30,7 @@ USE_VT = "0"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "jffs2"
+IMAGE_FSTYPES += "jffs2 ubifs"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \
@@ -43,6 +40,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
   mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
   ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+EXTRA_IMAGECMD_ubifs = "-m 2048 -e 129024 -c 2047"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"