Restore MACHINE_GUI_CLASS and MACHINE_DISPLAY_WIDTH_PIXELS / HEIGHT_PIXELSdylandora

Unfortunately these variables are still needed in meta-opie, which makes
choices about which images to use based upon the display size.
formfactor currently can't be used even at packaging time by other
recipes, so until that happens we need to preserve these.

This partially reverts commit 3c07a5817cf091c03f1c8a75eac7ba2dd27be00f.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

29 files changed, 103 insertions, 0 deletions

diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index a6f6f14..94fa36e 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -17,3 +17,8 @@ JFFS2_ERASEBLOCK = "0x20000"
 # 121 x 1024 : 128 = 968 PEBs
 MKUBIFS_ARGS = "-m 2048 -e 129024 -c 968 -x zlib"
 UBINIZE_ARGS = "-m 2048 -p 131072 -s 512"
+
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+
diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf
index 926b050..407d453 100644
--- a/conf/machine/ben-nanonote.conf
+++ b/conf/machine/ben-nanonote.conf
@@ -10,4 +10,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben-nanonote"
 #KERNEL_IMAGETYPE = "uImage"
 KERNEL_IMAGETYPE = "vmlinux.bin"
 
+#ScreenInfo
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
+
 MACHINE_FEATURES_append_ben-nanonote = " qvga"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 4254258..28a09bb 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -17,3 +17,8 @@ JFFS2_ERASEBLOCK = "0x4000"
 # 121 x 1024 : 16 = 7744 PEBs
 MKUBIFS_ARGS = "-m 512 -e 15872 -c 7744 -x zlib"
 UBINIZE_ARGS = "-m 512 -p 16384 -s 256"
+
+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 78c579a..8d1042e 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -13,3 +13,8 @@ EXTRA_IMAGECMD_jffs2 = "-p 14680064 -l -e ${JFFS2_ERASEBLOCK}"
 # 14.125 x 1024 : 128 = 113 PEBs
 MKUBIFS_ARGS = "-m 2048 -e 129024 -c 113 -x zlib"
 UBINIZE_ARGS = "-m 2048 -p 131072 -s 512"
+
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 012b2e5..83eca9e 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -7,6 +7,9 @@
 #
 require conf/machine/include/tune-xscale.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa irda usbgadget screen vfat qvga"
 
 #
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 6bc0908..6eba1df 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -16,6 +16,9 @@ UBOOT_LOADADDRESS = "0x30108000"
 UBOOT_ENTRYPOINT = "0x30108000"
 
 # Set features for task-base
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm bluetooth irda usbgadget screen vfat qvga"
 
 # Some extra configuration
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 97cfbb7..45aad59 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,6 +9,9 @@
 require conf/machine/include/tune-xscale.inc
 
 #Set some hints for metadata  
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat qvga"
 
 #
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 70d31d6..53e10cd 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -7,6 +7,9 @@
 #
 require conf/machine/include/tune-strongarm1100.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa irda usbgadget screen vfat ext2 qvga"
 
 #
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 70868c6..2d3c70a 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -7,6 +7,9 @@
 #
 require conf/machine/include/tune-xscale.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa irda bluetooth usbgadget screen vfat qvga"
 
 #
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index aad667d..af392ca 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -7,6 +7,9 @@
 #
 require conf/machine/include/tune-xscale.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat qvga"
 
 #
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index a01393b..2c81d8d 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -7,6 +7,9 @@
 #
 require conf/machine/include/tune-xscale.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat qvga"
 
 #
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 3be0628..da4f072 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -10,6 +10,9 @@ require conf/machine/include/tune-xscale.inc
 MACHINE_FEATURES += "iwmmxt"
 PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi vfat"
 
 #
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 0bb9a5b..617c3d1 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -16,6 +16,9 @@ PACKAGE_EXTRA_ARCHS_tune-xscale += "iwmmxt"
 #mtd2: 00580000 00020000 "VFM_Filesystem"
 #mtd3: 00020000 00020000 "Logo"
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 #
 # Software/packages selection
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index b6f4696..d9f05df 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -8,4 +8,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 MACHINE_FEATURES = "apm alsa pcmcia irda keyboard touchscreen screen vfat"
 MACHINE_EXTRA_RDEPENDS = "kernel-modules bluez-dtl1-workaround"
 
+#screeninfo
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
+
 SYSVINIT_ENABLED_GETTYS = "1 2 3 4 5 6"
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index be730c0..227b166 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -4,6 +4,9 @@
 
 require conf/machine/include/palm.inc
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
 MACHINE_FEATURES += "iwmmxt"
 
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 1ed7303..f093365 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -6,6 +6,8 @@ require conf/machine/include/palm.inc
 
 SERIAL_CONSOLE = "115200 ttyS1"
 
+MACHINE_GUI_CLASS = "bigscreen"
+
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
                            kernel-module-pxa27x-keyboard \
                            kernel-module-wm97xx-ts \
diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf
index b1b57c1..1a48cbf 100644
--- a/conf/machine/palmt680.conf
+++ b/conf/machine/palmt680.conf
@@ -6,5 +6,7 @@ require conf/machine/include/palm.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
+MACHINE_GUI_CLASS = "bigscreen"
+
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
                            kernel-module-wm97xx-ts"
diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf
index 2094354..4c86f1b 100644
--- a/conf/machine/palmtc.conf
+++ b/conf/machine/palmtc.conf
@@ -7,3 +7,6 @@ require conf/machine/include/palm.inc
 MACHINE_FEATURES += "wifi"
 
 SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_GUI_CLASS = "bigscreen"
+
diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf
index 8db4a66..2da5ab0 100644
--- a/conf/machine/palmtt.conf
+++ b/conf/machine/palmtt.conf
@@ -2,6 +2,10 @@
 #@NAME: Palm Tungsten T
 #@DESCRIPTION: Machine configuration for Palm Tungsten T/T2
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf
index 3e7c52d..cfbefbf 100644
--- a/conf/machine/palmtt5.conf
+++ b/conf/machine/palmtt5.conf
@@ -6,6 +6,8 @@ require conf/machine/include/palm.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
+MACHINE_GUI_CLASS = "bigscreen"
+
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
                            kernel-module-wm97xx-ts \
                            kernel-module-palmt5-battery"
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index 213c00b..877d5ae 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -4,6 +4,9 @@
 
 require conf/machine/include/palm.inc
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf
index 128e375..7f71eba 100644
--- a/conf/machine/palmz31.conf
+++ b/conf/machine/palmz31.conf
@@ -4,6 +4,10 @@
 
 require conf/machine/include/palm.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "160"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "160"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index d221f31..8da3d6c 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -4,6 +4,10 @@
 
 require conf/machine/include/palm.inc
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 9d11893..3f54f92 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -14,3 +14,8 @@ JFFS2_ERASEBLOCK = "0x4000"
 # 57 x 1024 : 16 = 3648 PEBs
 MKUBIFS_ARGS = "-m 512 -e 15872 -c 3648 -x zlib"
 UBINIZE_ARGS = "-m 512 -p 16384 -s 256"
+
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index 8b5da06..54fe6a4 100644
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -9,6 +9,9 @@
 # Samsung S3C2xxx CPU
 require conf/machine/include/tune-arm920t.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa irda wifi usbgadget screen vfat qvga"
 
 #
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index cdacee6..726db84 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -9,6 +9,9 @@
 # Samsung S3C2xxx CPU
 require conf/machine/include/tune-arm920t.inc
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat qvga"
 
 #
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 1e12ec4..d5ee19c 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -10,5 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 JFFS2_ERASEBLOCK = "0x20000"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS= "600"
 SERIAL_CONSOLE = "ttySA0 115200 vt100"
 USE_VT = "0"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 9d41637..f90bc92 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -28,3 +28,8 @@ JFFS2_ERASEBLOCK = "0x20000"
 # 121 x 1024 : 128 = 968 PEBs
 MKUBIFS_ARGS = "-m 2048 -e 129024 -c 968 -x zlib"
 UBINIZE_ARGS = "-m 2048 -p 131072 -s 512"
+
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 7e8c0da..58d27cc 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -14,3 +14,8 @@ JFFS2_ERASEBLOCK = "0x4000"
 # 121 x 1024 : 16 = 7744 PEBs
 MKUBIFS_ARGS = "-m 512 -e 15872 -c 7744 -x zlib"
 UBINIZE_ARGS = "-m 512 -p 16384 -s 256"
+
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+