From e20a2805241ac7f3f5b2538c59d5a51f50e70db8 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Tue, 2 Mar 2010 15:12:40 +0000 Subject: [PATCH] omap3-pandora.conf: Commit latest machine file. --- conf/machine/omap3-pandora.conf | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index eee2bf99f5..2564eae16f 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -5,20 +5,19 @@ TARGET_ARCH = "arm" - -PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" - +# Make sure we are using a recent XOrg X server +# (kDrive never really worked well on OMAP3 ;)) PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = " \ xserver-xorg \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-dri \ + xserver-xorg-extension-dri2 \ xf86-input-tslib \ xf86-input-evdev \ xf86-input-mouse \ xf86-input-keyboard \ xf86-video-omapfb \ + xf86-video-fbdev \ " #800 * 480 Widescreen @@ -27,8 +26,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -#IMAGE_FSTYPES += "tar.bz2 ubi" -IMAGE_FSTYPES = "tar.bz2" +IMAGE_FSTYPES = "tar.bz2 squashfs" SERIAL_CONSOLE = "115200 ttyS0" @@ -36,7 +34,7 @@ require conf/machine/include/omap3.inc # Put it below omap3.inc as we override the kernel and PR here PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -MACHINE_KERNEL_PR = "r3" +MACHINE_KERNEL_PR = "r12" # Use our 'Powered by Angstrom' splash for the images. PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora" @@ -65,8 +63,5 @@ UBOOT_MACHINE = "omap3_pandora_config" PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" PREFERRED_PROVIDER_x-load = "x-load-omap3pandora" -PREFERRED_VERSION_u-boot-omap3pandora = "git" -PREFERRED_VERSION_x-load-omap3pandora = "git" -EXTRA_IMAGEDEPENDS += "u-boot x-load" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" -- 2.39.5