conf/machine/: Add new screen parameter variables for a bunch of machines.

13 files changed, 40 insertions, 15 deletions

diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 574e10fae0..131b6512e0 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "16"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 
 #
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 1a63643868..3afec8be27 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -10,13 +10,15 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
 
 # Set features for task-base
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen"
 
 
 # Some extra configuration
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "32"
-GUI_MACHINE_CLASS = "smallscreen"
 SERIAL_CONSOLE = "115200 ttySAC2 vt100"
 USE_VT = "0"
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 56f1d17c04..ecaebb8535 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -14,9 +14,9 @@ require conf/machine/include/tune-xscale.conf
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "32"
-GUI_MACHINE_CLASS = "smallscreen"
-
-#Set features for task-base 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
 
 #
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 953c90590d..fe204f0be4 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -14,7 +14,9 @@ require conf/machine/include/tune-strongarm.conf
 ROOT_FLASH_SIZE = "16"
 # h3630 have 32Mb only
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget  screen"
 
 #
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 32b6a8ea8a..8612be2ddc 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
 
 #
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index f48f560d0f..c28e651b47 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
@@ -24,6 +26,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
+                             kernel-module-h4000-pcmcia \
                              kernel-module-i2c-pxa \
                              kernel-module-acx \
                             "
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 8645df3555..87cc4c6210 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen"
 
 #
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index ecc658982b..a44d2d328f 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -12,7 +12,9 @@ PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
 require conf/machine/include/tune-arm9tdmi.conf
 
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index 872942e17a..5fb2bb4cd4 100644
--- a/conf/machine/htcsable.conf
+++ b/conf/machine/htcsable.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 
 #
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index e2e7f2f2d1..bd2e1439a5 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -14,7 +14,9 @@ require conf/machine/include/tune-xscale.conf
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
 #require conf/machine/include/tune-iwmmxt.conf
 
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone"
 
 #
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index ffffc3a569..279b273a70 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -25,7 +25,9 @@ PCMCIA_MANAGER = "pcmciautils"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 # 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/hx4700.conf b/conf/machine/hx4700.conf
index 5483a3337f..92cb52346a 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "80"
 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/looxc550.conf b/conf/machine/looxc550.conf
index ad195b9436..c191349498 100644
--- a/conf/machine/looxc550.conf
+++ b/conf/machine/looxc550.conf
@@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf
 
 ROOT_FLASH_SIZE = "32"
 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 irda bluetooth usbgadget screen"
 
 #