[oe-commits] Martin Jansa : om-gta0(1|2): synchronize machine config, drop SHR override where not needed anymore

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 142c5b6fa24ddaf61fd570ccf159ab97b490c9e0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=142c5b6fa24ddaf61fd570ccf159ab97b490c9e0

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Jan 31 03:03:02 2010 +0100

om-gta0(1|2): synchronize machine config, drop SHR override where not needed anymore

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/om-gta01.conf |   53 ++++++++++++++++++++++++++++++++++---------
 conf/machine/om-gta02.conf |   11 ++++-----
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index e1c5127..4f34cae 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -7,28 +7,36 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
-# SHR-specific overrides to the machine.conf file
+# 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"
-PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
-PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev"
-PREFERRED_PROVIDER_virtual/libgl = "mesa"
-XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32"
+
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa"
 
 UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-fbdev"
+XSERVER ?= "xserver-xorg \
+           xf86-input-tslib \
+           xf86-input-evdev \
+           xf86-video-glamo \
+           xf86-input-keyboard \
+           xf86-input-mouse"
 
 # fbreader specific
 READER_RESOLUTION = "480x640"
-READER_ARCH	  = "openzaurus"
+READER_ARCH       = "desktop"
+READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
@@ -47,9 +55,33 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 # used by some images
 ROOT_FLASH_SIZE = "60"
 
+IMAGE_FSTYPES += "tar.gz jffs2 ubi"
+
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
+  --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
+  --littleendian --pad \
+  -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 2047"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "dfu-util-native"
@@ -58,4 +90,3 @@ module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
-
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index ca4c050..eb48d01 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -14,13 +14,10 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
 
-PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
 # Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
 MACHINE_DRI_MODULES_shr = "glamo"
 
-XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
-
 UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
@@ -32,13 +29,15 @@ MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
            xf86-input-tslib \
+           xf86-input-evdev \
            xf86-video-glamo \
-           xf86-input-keyboard"
+           xf86-input-keyboard \
+           xf86-input-mouse"
 
 # fbreader specific
 READER_RESOLUTION = "480x640"
-READER_ARCH	  = "desktop"
-READER_UI	  = "gtk"
+READER_ARCH       = "desktop"
+READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\