aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSergey Lapin <slapinid@gmail.com>2007-07-12 15:11:12 +0000
committerSergey Lapin <slapinid@gmail.com>2007-07-12 15:11:12 +0000
commit8c8ac6204e0e3bab2160f1848dcec1dec02836df (patch)
treef9eaf1f33b5bbbe281d8c414d61b67d3962dc569 /conf
parent89bc399aa9a905624c912f69d97d25d001787554 (diff)
parent41a9fdc088f60373864a5128e5b69d467412a34c (diff)
downloadopenembedded-8c8ac6204e0e3bab2160f1848dcec1dec02836df.tar.gz
merge of '5e082795f9bdcb7a895ebe0387566db073a6b4f6'
and 'c0b27fb20d3acf8fd54af737b63355f45246e05a'
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf10
1 files changed, 8 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a4dd4b18a8..77d6c1ee83 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -468,7 +468,7 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
OES_BITBAKE_CONF = "1"
##################################################################
-# Task-base stuff
+# Machine properties and task-base stuff
##################################################################
MACHINE_FEATURES ?= "kernel26"
@@ -477,7 +477,13 @@ DISTRO_FEATURES ?= ""
# This is used to limit what packages goes into images built, so set big by default
ROOT_FLASH_SIZE ?= "256"
-GUI_MACHINE_CLASS ?= "smallscreen"
+MACHINE_GUI_CLASS ?= "smallscreen"
+# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
+GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
+MACHINE_DISPLAY_ORIENTATION ?= "0"
+MACHINE_DISPLAY_BPP ?= "16"
DISTRO_EXTRA_RDEPENDS ?= ""
DISTRO_EXTRA_RRECOMMENDS ?= ""