Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
	recipes/linux/linux-kirkwood_2.6.33-rc1.bb

7 files changed, 30 insertions, 16 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 6f71787fa1..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-# xserver-kdrive 1.3.0.0 is still the only working version:
-XSERVER = "xserver-kdrive-1300-fbdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 16073fee82..4daedde482 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc
 # please set the right value in your local.conf
 ROOT_FLASH_SIZE = "25"
 
-XSERVER = "xserver-kdrive-imageon"
-
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "640"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 47f6e30dfd..66995e9b09 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14"
 # actually 14680064
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
-XSERVER = "xserver-kdrive-fbdev"
-
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index bd8401a020..a262059d45 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r31"
+MACHINE_KERNEL_PR = "r32"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cd83a7b5a6..02a48629c8 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer"
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 
+# FIXME: xserver-xorg is in testing
+
+# deprecated defaults
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# c7x0 uses kdrive-imageon (W100)
 PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
+XSERVER_c7x0 = "xserver-kdrive-imageon"
+
+# collie uses kdrive-fbdev
 PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
+XSERVER_collie = "xserver-kdrive-fbdev"
+
+# FIXME xserver-kdrive 1.3.0.0 is still the only working version ?
+PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300"
+XSERVER_akita = "xserver-kdrive-1300-fbdev"
+
+# spitz uses xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
+XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index c5249d94ef..f709f51c09 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -6,9 +6,16 @@ TARGET_ARCH = "sh3"
 
 require conf/machine/include/tune-sh3.inc
 
+MACHINE_FEATURES = "kernel26 alsa pcmcia irda keyboard touchscreen screen vfat"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.17"
+PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.32"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-tslib \
+           xf86-video-fbdev"
 
-MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 PCMCIA_MANAGER = "pcmciautils"
\ No newline at end of file
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0d79977180..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"