merge of '1ece995451ce1a3da5c2124442977354e1e6a143'

     and '519a89f1a79b55264782142c46e74ce09c0926c4'

7 files changed, 19 insertions, 9 deletions

diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
index 85ca5d106a..7d8d8815f0 100644
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "64"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
diff --git a/conf/machine/aximx50v.conf b/conf/machine/aximx50v.conf
index 9b38da782e..2c84768498 100644
--- a/conf/machine/aximx50v.conf
+++ b/conf/machine/aximx50v.conf
@@ -4,4 +4,6 @@
 
 require conf/machine/aximx50.conf
 
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
index 2ddb808836..565f37b43f 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.conf
@@ -7,8 +7,6 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index b64a66ff60..7adb352ba4 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -6,6 +6,9 @@ require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
 
 
diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf
index 0d74a56156..72b1f310ad 100644
--- a/conf/machine/palmtt.conf
+++ b/conf/machine/palmtt.conf
@@ -5,9 +5,12 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv5te"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index 4eb804aba0..d9b934a306 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -4,14 +4,15 @@
 
 require conf/machine/include/palm.conf
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
 
 ROOT_FLASH_SIZE = "100"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
                            kernel-module-pxapwm-bl \
                            kernel-module-wm97xx-ts \
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index 2e787a89f3..a654877d36 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -5,11 +5,12 @@
 require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-thumb.conf