+++ /dev/null
-# SHR-specific overrides to the machine.conf file
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_xf86-video-fbdev = "xf86-video-fbdev"
-PREFERRED_PROVIDER_mesa = "mesa"
-PREFERRED_PROVIDER_drm = "libdrm"
-
-XSERVER = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
-
-
+++ /dev/null
-# 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 = "linux-openmoko-shr-devel"
-#PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
-MACHINE_DRI_MODULES = "glamo"
-
-XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
-
#LIBC = "glibc"
-# We need to override some machine stuff as well; include the machine-
-# specific file here (if it exists).
-include conf/distro/include/shr-${MACHINE}.conf
-
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
require conf/distro/include/preferred-shr-versions.inc
require conf/distro/include/shr-autorev.inc
TARGET_ARCH = "arm"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
+
+# SHR-specific overrides to the machine.conf file
+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_mesa_shr = "mesa"
+XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
+
+
UBOOT_ENTRYPOINT = "30008000"
OLDEST_KERNEL_linux-gnueabi = "2.6.24"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
+
+# 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/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"
+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"