[oe-commits] org.oe.dev merge of '395d6de41c854bc96db2108e2c2b5a7736072d2d'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Jul 17 22:43:48 UTC 2007
merge of '395d6de41c854bc96db2108e2c2b5a7736072d2d'
and 'e0818c624e0ff59f9dba6d80979f53a71cac71a4'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1ece995451ce1a3da5c2124442977354e1e6a143
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1ece995451ce1a3da5c2124442977354e1e6a143
Files:
1
packages/libsdl/files/kernel-asm-page.patch
conf/machine/compulab-pxa270.conf
packages/libsdl/libsdl-native_1.2.11.bb
packages/linphone/linphone_1.6.0.bb
packages/webkit/webkit/WebKit.pri
conf/machine/acern30.conf
conf/machine/asus620.conf
conf/machine/aximx50.conf
conf/machine/eteng500.conf
conf/machine/h1910.conf
conf/machine/h1940.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/h4000.conf
conf/machine/h5000.conf
conf/machine/h6300.conf
conf/machine/htcalpine.conf
conf/machine/htcapache.conf
conf/machine/htcblueangel.conf
conf/machine/htchimalaya.conf
conf/machine/htcsable.conf
conf/machine/htcuniversal.conf
conf/machine/htcwallaby.conf
conf/machine/hx2000.conf
conf/machine/hx4700.conf
conf/machine/looxc550.conf
conf/machine/magician.conf
conf/machine/rx1950.conf
conf/machine/rx3000.conf
packages/linux/linux-handhelds-2.6.inc
Diffs:
#
# mt diff -r395d6de41c854bc96db2108e2c2b5a7736072d2d -r1ece995451ce1a3da5c2124442977354e1e6a143
#
#
#
# add_file "packages/libsdl/files/kernel-asm-page.patch"
# content [c330d9173694f5d2da97b4be571622fb8ad8d195]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [e1433a559cc7c747740b88df5f017a83d402e34a]
# to [d9dda180b32b678bbc7dc3203f202d0227bd7798]
#
# patch "packages/libsdl/libsdl-native_1.2.11.bb"
# from [e9e581735b9f05b42424cddeb52b17e590296483]
# to [5e5d90533f76a9b2ce70d129759c139f4c7df596]
#
# patch "packages/linphone/linphone_1.6.0.bb"
# from [77c69b1286f82211e37b6d6cde29f8fc492c17c7]
# to [12fa57bdfc35f887f98bd8c835b566f34d02f011]
#
# patch "packages/webkit/webkit/WebKit.pri"
# from [66a2198f6e713621703e637cb558322feb4153e5]
# to [7f89130236b19b36013eb4b046d00719507e4f12]
#
============================================================
--- packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
+++ packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
@@ -0,0 +1,13 @@
+diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
+index 4e3d662..de38a3c 100644
+--- a/src/video/Xext/Xxf86dga/XF86DGA.c
++++ b/src/video/Xext/Xxf86dga/XF86DGA.c
+@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
+ #define HAS_MMAP_ANON
+ #include <sys/types.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* PAGE_SIZE */
++#include <unistd.h>
+ #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
+ #define HAS_GETPAGESIZE
+ #endif /* linux */
============================================================
--- conf/machine/compulab-pxa270.conf e1433a559cc7c747740b88df5f017a83d402e34a
+++ conf/machine/compulab-pxa270.conf d9dda180b32b678bbc7dc3203f202d0227bd7798
@@ -21,7 +21,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
- -e 0x20000 -p\
+ -e 0x20000 -p; \
cd ${DEPLOY_DIR_IMAGE}; \
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
============================================================
--- packages/libsdl/libsdl-native_1.2.11.bb e9e581735b9f05b42424cddeb52b17e590296483
+++ packages/libsdl/libsdl-native_1.2.11.bb 5e5d90533f76a9b2ce70d129759c139f4c7df596
@@ -1,11 +1,12 @@ LICENSE = "LGPL"
DESCRIPTION = "Simple DirectMedia Layer - native Edition"
HOMEPAGE = "http://www.libsdl.org"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://acinclude.m4"
+ file://acinclude.m4 \
+ file://kernel-asm-page.patch;patch=1 "
S = "${WORKDIR}/SDL-${PV}"
inherit autotools binconfig pkgconfig native
============================================================
--- packages/linphone/linphone_1.6.0.bb 77c69b1286f82211e37b6d6cde29f8fc492c17c7
+++ packages/linphone/linphone_1.6.0.bb 12fa57bdfc35f887f98bd8c835b566f34d02f011
@@ -16,9 +16,9 @@ RDEPENDS_libmediastreamer = "speex libog
RDEPENDS_libquickstream = "speex libmediastreamer libasound"
RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
-PROVIDES = "linphone linphonec liblinphone"
+PROVIDES += "linphone linphonec liblinphone"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
@@ -61,9 +61,9 @@ FILES_${PN}-rings = "${datadir}/sounds/l
FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
-FILES_liblinphone = "${libdir}/liblinphone.so*"
-FILES_libquickstream = "${libdir}/libquickstream.so*"
-FILES_libmediastreamer = "${libdir}/libmediastreamer.so*"
-FILES_libortp = "${libdir}/libortp.so*"
-FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+FILES_libquickstream = "${libdir}/libquickstream.so.*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so.*"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
============================================================
--- packages/webkit/webkit/WebKit.pri 66a2198f6e713621703e637cb558322feb4153e5
+++ packages/webkit/webkit/WebKit.pri 7f89130236b19b36013eb4b046d00719507e4f12
@@ -1,7 +1,10 @@
# Include file to make it easy to include WebKit into Qt projects
-isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+isEmpty(OUTPUT_DIR) {
+ CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+ CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+}
!gdk-port:CONFIG += qt-port
qt-port:DEFINES += BUILDING_QT__=1
@@ -32,6 +35,7 @@ INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/bindings \
$$BASE_DIR/JavaScriptCore/bindings/c \
$$BASE_DIR/JavaScriptCore/wtf \
+ $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
$$BASE_DIR/WebCore \
$$BASE_DIR/WebCore/ForwardingHeaders \
$$BASE_DIR/WebCore/platform \
#
# mt diff -re0818c624e0ff59f9dba6d80979f53a71cac71a4 -r1ece995451ce1a3da5c2124442977354e1e6a143
#
#
#
# patch "conf/machine/acern30.conf"
# from [85ec948d1ae47522e130038f9b758d6569edf4b7]
# to [9c52a1cccbe17187e7b52c351948ae86e0b32e62]
#
# patch "conf/machine/asus620.conf"
# from [8759dc966e16800078ab57830c8899131485bf94]
# to [3ec2bcaf2f3a141ac7d301ef1f1a9b0617789913]
#
# patch "conf/machine/aximx50.conf"
# from [9726c6679a9e55fd5ac371f38e805a615faaeeb7]
# to [72a5d88c7a8529d282176fc486b64e123da52db5]
#
# patch "conf/machine/eteng500.conf"
# from [27434564dbe644feb612f2a4d67df69709b28627]
# to [a250d05bdfd2830904b372bd882edc65eb668eb1]
#
# patch "conf/machine/h1910.conf"
# from [849b963e2d8be6d76b24ba847427cc0c76e5e4ef]
# to [d8fc676782c248b44559c7b0f6935bb778ac5e35]
#
# patch "conf/machine/h1940.conf"
# from [5392562b54d75272c87cdbbdf40ed1014ce32063]
# to [b25dc9dcdbb46bf55c25394f7d302df458f51cb0]
#
# patch "conf/machine/h2200.conf"
# from [ff1f7205bab8be68726927066f32d2c9dbc19f32]
# to [20009a5a241422421f15d37c746d94fb7ce42c9b]
#
# patch "conf/machine/h3600.conf"
# from [0dfb3e73160f5b833280004b13a93a5c88ac0678]
# to [c7d3b15dbb45c245394213ddc198aa936bb65efe]
#
# patch "conf/machine/h3900.conf"
# from [cd1a3369692eb834c4ef7240265a9c7f6b0bc952]
# to [3b3c95e6d499cc7a07dd38d1cbdd2b05b267b82c]
#
# patch "conf/machine/h4000.conf"
# from [b1fe581faf246de6c051ab60e24a5ddd578bf16e]
# to [43908da203130e1aa147ed483ddda1e50cd99d9e]
#
# patch "conf/machine/h5000.conf"
# from [b002bb3c0eb1cd58823200737f00665fb8fe6e9b]
# to [367aab3fcfd3df1fe3e07cb9d12ab127a5f0cc87]
#
# patch "conf/machine/h6300.conf"
# from [9150d15aab4b2ec0eedbac7b66797de880ba58b6]
# to [48641608e1fe5cfd6f9233b8bd0eea9be92c1a9a]
#
# patch "conf/machine/htcalpine.conf"
# from [c01cd0864f596338b5532f886e7e2cb05ad8deef]
# to [997139ee2dff935258cff496b5ce816d3056e782]
#
# patch "conf/machine/htcapache.conf"
# from [7d257809c803eaedc45b392f842a60471786226c]
# to [cb1409688fb5471a4dc431e5157fb7e94e3d6a24]
#
# patch "conf/machine/htcblueangel.conf"
# from [9f5fe21162f6a280ef6f17c8c0d23dafe9671876]
# to [54400a45483dcfe44328405f2925ebb85c1add59]
#
# patch "conf/machine/htchimalaya.conf"
# from [aef09cd96d2c3ba8af5aa73674e56c27c64a974e]
# to [a0904b8ded1cea237c6175d0c6c6d85d527247be]
#
# patch "conf/machine/htcsable.conf"
# from [0d76addabdd29518709019745459807b3230d95a]
# to [7239f3067b521a987c159b5188b080d36f4bd2c5]
#
# patch "conf/machine/htcuniversal.conf"
# from [70a1b06b93d715292b3e8e4ed4ff540aa6dc7e11]
# to [946c0b5be45fdaa05899265e5908a704dd88a293]
#
# patch "conf/machine/htcwallaby.conf"
# from [7eaaf072e197ae8aca3285e3c2c4decaa61230cc]
# to [1aa710bea907b5e57d65cc2cea7f14ded372c633]
#
# patch "conf/machine/hx2000.conf"
# from [a49faa5811bf85a25308a0d717737bb70a676e64]
# to [a3696733b0f44f3e26fbb5dff6befb8f69462535]
#
# patch "conf/machine/hx4700.conf"
# from [d72ebf1f049cc0b9a9004b4611cda090088dcb99]
# to [a98297fd1c958ca100de38bd071c622423c22d11]
#
# patch "conf/machine/looxc550.conf"
# from [580805d6504125b6b388063944e71d592c42db61]
# to [6359ad9d0de70d918a9008fc0b5f95adeaf74dff]
#
# patch "conf/machine/magician.conf"
# from [a7fb4b2e2e543b31b162a08be84244bfdd3486c0]
# to [d3eace552477d42a45705e3431b858974e0578b6]
#
# patch "conf/machine/rx1950.conf"
# from [8f5b10c3e933d4d074eca5a5cb27df7829d2d85f]
# to [30ceac226dee7467c59d59e4d9b606ac2dab75e7]
#
# patch "conf/machine/rx3000.conf"
# from [a98200ab7bb797ade505f0e3b872f1ff795dbaf7]
# to [73b581513961c54694eec0209768355fd6e80618]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [9e48a6e2e961f90636b27931c73fa87d941a314d]
# to [9b3c8a9d312251557d97f3ea805ec796b389c4cc]
#
============================================================
--- conf/machine/acern30.conf 85ec948d1ae47522e130038f9b758d6569edf4b7
+++ conf/machine/acern30.conf 9c52a1cccbe17187e7b52c351948ae86e0b32e62
@@ -13,7 +13,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/asus620.conf 8759dc966e16800078ab57830c8899131485bf94
+++ conf/machine/asus620.conf 3ec2bcaf2f3a141ac7d301ef1f1a9b0617789913
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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 irda bluetooth usbgadget screen"
#
============================================================
--- conf/machine/aximx50.conf 9726c6679a9e55fd5ac371f38e805a615faaeeb7
+++ conf/machine/aximx50.conf 72a5d88c7a8529d282176fc486b64e123da52db5
@@ -16,7 +16,9 @@ VOLATILE_STORAGE_SIZE = "64"
ROOT_FLASH_SIZE = "256"
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 screen"
#
============================================================
--- conf/machine/eteng500.conf 27434564dbe644feb612f2a4d67df69709b28627
+++ conf/machine/eteng500.conf a250d05bdfd2830904b372bd882edc65eb668eb1
@@ -13,7 +13,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/h1910.conf 849b963e2d8be6d76b24ba847427cc0c76e5e4ef
+++ conf/machine/h1910.conf d8fc676782c248b44559c7b0f6935bb778ac5e35
@@ -12,7 +12,9 @@ ROOT_FLASH_SIZE = "16"
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"
#
============================================================
--- conf/machine/h1940.conf 5392562b54d75272c87cdbbdf40ed1014ce32063
+++ conf/machine/h1940.conf b25dc9dcdbb46bf55c25394f7d302df458f51cb0
@@ -10,13 +10,15 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
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"
============================================================
--- conf/machine/h2200.conf ff1f7205bab8be68726927066f32d2c9dbc19f32
+++ conf/machine/h2200.conf 20009a5a241422421f15d37c746d94fb7ce42c9b
@@ -14,9 +14,9 @@ ROOT_FLASH_SIZE = "32"
#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"
#
============================================================
--- conf/machine/h3600.conf 0dfb3e73160f5b833280004b13a93a5c88ac0678
+++ conf/machine/h3600.conf c7d3b15dbb45c245394213ddc198aa936bb65efe
@@ -14,7 +14,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/h3900.conf cd1a3369692eb834c4ef7240265a9c7f6b0bc952
+++ conf/machine/h3900.conf 3b3c95e6d499cc7a07dd38d1cbdd2b05b267b82c
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/h4000.conf b1fe581faf246de6c051ab60e24a5ddd578bf16e
+++ conf/machine/h4000.conf 43908da203130e1aa147ed483ddda1e50cd99d9e
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
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 \
"
============================================================
--- conf/machine/h5000.conf b002bb3c0eb1cd58823200737f00665fb8fe6e9b
+++ conf/machine/h5000.conf 367aab3fcfd3df1fe3e07cb9d12ab127a5f0cc87
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/h6300.conf 9150d15aab4b2ec0eedbac7b66797de880ba58b6
+++ conf/machine/h6300.conf 48641608e1fe5cfd6f9233b8bd0eea9be92c1a9a
@@ -12,7 +12,9 @@ require conf/machine/include/tune-arm9td
#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"
#
============================================================
--- conf/machine/htcalpine.conf c01cd0864f596338b5532f886e7e2cb05ad8deef
+++ conf/machine/htcalpine.conf 997139ee2dff935258cff496b5ce816d3056e782
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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 irda bluetooth usbgadget screen"
#
============================================================
--- conf/machine/htcapache.conf 7d257809c803eaedc45b392f842a60471786226c
+++ conf/machine/htcapache.conf cb1409688fb5471a4dc431e5157fb7e94e3d6a24
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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 irda bluetooth usbgadget screen"
#
============================================================
--- conf/machine/htcblueangel.conf 9f5fe21162f6a280ef6f17c8c0d23dafe9671876
+++ conf/machine/htcblueangel.conf 54400a45483dcfe44328405f2925ebb85c1add59
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "128"
ROOT_FLASH_SIZE = "32"
VOLATILE_STORAGE_SIZE = "128"
-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"
#
============================================================
--- conf/machine/htchimalaya.conf aef09cd96d2c3ba8af5aa73674e56c27c64a974e
+++ conf/machine/htchimalaya.conf a0904b8ded1cea237c6175d0c6c6d85d527247be
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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 usbgadget screen"
#
============================================================
--- conf/machine/htcsable.conf 0d76addabdd29518709019745459807b3230d95a
+++ conf/machine/htcsable.conf 7239f3067b521a987c159b5188b080d36f4bd2c5
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/htcuniversal.conf 70a1b06b93d715292b3e8e4ed4ff540aa6dc7e11
+++ conf/machine/htcuniversal.conf 946c0b5be45fdaa05899265e5908a704dd88a293
@@ -14,7 +14,9 @@ require conf/machine/include/tune-xscale
# 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"
#
============================================================
--- conf/machine/htcwallaby.conf 7eaaf072e197ae8aca3285e3c2c4decaa61230cc
+++ conf/machine/htcwallaby.conf 1aa710bea907b5e57d65cc2cea7f14ded372c633
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "32"
ROOT_FLASH_SIZE = "16"
VOLATILE_STORAGE_SIZE = "32"
-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 phone"
#
============================================================
--- conf/machine/hx2000.conf a49faa5811bf85a25308a0d717737bb70a676e64
+++ conf/machine/hx2000.conf a3696733b0f44f3e26fbb5dff6befb8f69462535
@@ -25,7 +25,9 @@ SERIAL_CONSOLE = "115200 ttyS0"
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
============================================================
--- conf/machine/hx4700.conf d72ebf1f049cc0b9a9004b4611cda090088dcb99
+++ conf/machine/hx4700.conf a98297fd1c958ca100de38bd071c622423c22d11
@@ -16,7 +16,9 @@ VOLATILE_STORAGE_SIZE = "64"
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"
#
============================================================
--- conf/machine/looxc550.conf 580805d6504125b6b388063944e71d592c42db61
+++ conf/machine/looxc550.conf 6359ad9d0de70d918a9008fc0b5f95adeaf74dff
@@ -12,7 +12,9 @@ VOLATILE_STORAGE_SIZE = "64"
ROOT_FLASH_SIZE = "32"
VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list