[oe-commits] David-John Willis : omap3-pandora.conf: Merge in latest machine file.

[git version control]

Module: openembedded.git
Branch: rpurdie/work-in-progress
Commit: 995cb3cbff685940f9e52c52b941b0634209492f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=995cb3cbff685940f9e52c52b941b0634209492f

Author: David-John Willis <John.Willis at Distant-earth.com>
Date:   Wed Oct 28 19:21:53 2009 +0000

omap3-pandora.conf: Merge in latest machine file.

---

 conf/machine/omap3-pandora.conf |   72 ++++++++++++++++++++++++++++++--------
 1 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index b06cb31..2d068c2 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -1,33 +1,75 @@
 #@TYPE: Machine
 #@NAME: OMAP3 based Pandora Handheld Console
 #@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console
+#@MAINTAINER: John Willis
 
 TARGET_ARCH = "arm"
-require conf/machine/include/omap3.inc
+
+MACHINE_EXTRA_RRECOMMENDS = "omap3-sgx-modules "
 
 PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-tslib \
-           xf86-video-omapfb \
-          "
 
-#What is the correct one, both seem in use?
-MACHINE_GUI_CLASS = "bigscreen"
-GUI_MACHINE_CLASS = "bigscreen"
+XSERVER = " \
+	xserver-xorg \
+	xserver-xorg-extension-glx \
+	xserver-xorg-extension-dri \
+	xf86-input-evtouch \	
+	xf86-input-evdev \
+	xf86-input-mouse \
+	xf86-input-keyboard \
+	xf86-video-omapfb \
+"
 
 #800 * 480 Widescreen
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "800"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
-# Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
-
-IMAGE_FSTYPES += "jffs2 tar.bz2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
+#IMAGE_FSTYPES += "tar.bz2 ubi"
+IMAGE_FSTYPES = "tar.bz2"
+#EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen bluetooth wifi"
+require conf/machine/include/omap3.inc
+
+# Put it below omap3.inc as we override the kernel here
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+# Use our 'Powered by Angstrom' splash for the images.
+PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# 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 129024 -c 1996"
+
+# 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 512"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "omap3_pandora_config"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
+PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "x-load"
+
+PREFERRED_VERSION_libgles-omap3 = "3.00.00.09"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"