[oe-commits] org.oe.dev merge of 'c038e0efea1f81ad9c7092f84a3bd377a19e712b'
koen commit
openembedded-commits at lists.openembedded.org
Tue Jul 3 12:18:04 UTC 2007
merge of 'c038e0efea1f81ad9c7092f84a3bd377a19e712b'
and 'edcd7cc3ce3933c1022989d2297e120211a6d3fa'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 0e495bf8b77effda83a630b3b3c33f44f2768da7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0e495bf8b77effda83a630b3b3c33f44f2768da7
Files:
1
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-fsg3.h
packages/opie-qcop/files
conf/machine/include/motorola-ezx-base.inc
packages/kazehakase/kazehakase_cvs.bb
packages/opie-qcop/files/unbreak-logging.patch
classes/opie.bbclass
conf/bitbake.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
conf/distro/include/sane-srcdates.inc
conf/machine/a1200.conf
conf/machine/a780.conf
conf/machine/e680.conf
conf/machine/rokr-e2.conf
conf/machine/wl500g.conf
packages/kazehakase/kazehakase_0.4.5.bb
packages/kazehakase/kazehakase_0.4.7.bb
packages/libopie/libopie2_cvs.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
packages/opie-console/opie-console.inc
packages/opie-console/opie-console_cvs.bb
packages/opie-init/opie-init/opie
packages/opie-init/opie-init/opie_defaults
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_1.2.2.bb
packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
packages/opie-networksettings/opie-networksettings_cvs.bb
packages/opie-oxygen/opie-oxygen.inc
packages/opie-qcop/opie-qcop_cvs.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/qte/qte-mt_2.3.10.bb
Diffs:
#
# mt diff -rc038e0efea1f81ad9c7092f84a3bd377a19e712b -r0e495bf8b77effda83a630b3b3c33f44f2768da7
#
#
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# from [363539e6aa9b48b4075ef6f22841c250058075ba]
# to [691bb266bc3a89e594d2718bda178991edd6718a]
#
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
# from [6420555a5dfd7edfd3e08a847c058eb380b637df]
# to [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
#
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 363539e6aa9b48b4075ef6f22841c250058075ba
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 691bb266bc3a89e594d2718bda178991edd6718a
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "ARM Kernel Shim"
SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
@@ -20,7 +20,7 @@ CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblo
CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_FSG3 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+# CMDLINE is passed correctly on the Freecom FSG-3 from the bootloader.
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
@@ -70,7 +70,6 @@ oe_runmake() {
sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
${WORKDIR}/config-fsg3.h > ${S}/config.h
fi
- echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_FSG3} ${CMDLINE_DEBUG}\"" >> ${S}/config.h
rm -f ${S}/main.o
oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
============================================================
--- packages/arm-kernel-shim/files/config-fsg3.h 6420555a5dfd7edfd3e08a847c058eb380b637df
+++ packages/arm-kernel-shim/files/config-fsg3.h cf13549daefc67ce00ab2a9b1280d2363849d1e7
@@ -21,8 +21,6 @@
#define MACH_TYPE 1091
-#define CREATE_ATAGS
-
/* Uncomment one of these to switch the CPU into a specific mode. */
//#define FORCE_LITTLEENDIAN
//#define FORCE_BIGENDIAN
#
# mt diff -redcd7cc3ce3933c1022989d2297e120211a6d3fa -r0e495bf8b77effda83a630b3b3c33f44f2768da7
#
#
#
# add_dir "packages/opie-qcop/files"
#
# add_file "conf/machine/include/motorola-ezx-base.inc"
# content [0667c6b496dfb760566158b9fbbd7d6d278b90a6]
#
# add_file "packages/kazehakase/kazehakase_cvs.bb"
# content [1b5a8edcf4a52f628f27e5e38dff856525b60edc]
#
# add_file "packages/opie-qcop/files/unbreak-logging.patch"
# content [78d5b44b38724d0bd7192f584e0306681ac936be]
#
# patch "classes/opie.bbclass"
# from [63b61b5cd7a8d7d3fb50c8802c996927a4316994]
# to [2653571d91e93ff5043997740e80656344ad35d8]
#
# patch "conf/bitbake.conf"
# from [d52250874c724734f38a1342376ffb804d7a19fb]
# to [4481b02aa24ad52f996889ffadf4f12e9912c116]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [59159a926215caee1cf37b3d07c5a4bcf28deb10]
# to [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [cb939b1a389e8b33c0bf4f658e709da4337a4add]
# to [c70c421338b418901a172a9210ea87a82ab763c0]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [5976f51d1a203540984b37aea9a01200c509f145]
# to [acd77cb1b7ff38f08af7ea0f756e371ee8730a48]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [6ff359c7c5d04888f86bbdbf580342faa6b125e4]
# to [5f9b174bd679d8f5b634fdcde2cddde0853a9369]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [b2c78cdbf95e8492c4d56dd1afcca640d4e1bf2e]
# to [211037ba3b8be809090a4a8d44a0ea8d709dae7e]
#
# patch "conf/machine/a1200.conf"
# from [a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/a780.conf"
# from [0b4ea0352725660f6f5612a0c0cb267b0274953e]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/e680.conf"
# from [987ace20df2d1dc626ea26f22b62e9dc7289adc5]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/rokr-e2.conf"
# from [3c78073478e131d6f10f163a67a8c03cd4fa6593]
# to [0d6bee13f804137fbb6e3564ed46b0422b8dc682]
#
# patch "conf/machine/wl500g.conf"
# from [f078925639f82bd00755302772f7671bd1d7e603]
# to [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
#
# patch "packages/kazehakase/kazehakase_0.4.5.bb"
# from [2e14bb25ffbd6926f5a10ff4eb9a140996a469c3]
# to [33ebf750491386560f3a270602c11d797ef5bfb2]
#
# patch "packages/kazehakase/kazehakase_0.4.7.bb"
# from [c1051d793dabd07e39bcfb134d49967696a9bf43]
# to [b6fe737fdbc7bc21d3c74fa6ee5984c468f858a0]
#
# patch "packages/libopie/libopie2_cvs.bb"
# from [0b8fdd63993047dd867ec4552c1c2b70706021a6]
# to [66b355cdaf0863882ba11282e95ea14ad73da233]
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [30c1691eb0545cae035edf4a5dc84986235a36b6]
# to [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [baf3a4ab2d24dd30f79920a234075d1f6384d066]
# to [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
#
# patch "packages/opie-console/opie-console.inc"
# from [26cd72b1f13cad3ed41dcd0451d54d7b8db3ef8c]
# to [b00cb8042f00def502c053a84e38d7a15b8f6d76]
#
# patch "packages/opie-console/opie-console_cvs.bb"
# from [8289d1df5721cab3ef9a0f28d03201ed4ab7309a]
# to [42fb7a012fce1c5b7170d185cf345f499ec1bd94]
#
# patch "packages/opie-init/opie-init/opie"
# from [879c03529cdeef4128ae40faefe35801f5376f43]
# to [939a977703c5c993189c8355d175b621bfe71969]
#
# patch "packages/opie-init/opie-init/opie_defaults"
# from [971ecb87286e39af8be9705978014aa9f4a29506]
# to [75480531b6dcda113547fddda2009db52f8bc09f]
#
# patch "packages/opie-init/opie-init.inc"
# from [9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b]
# to [5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d]
#
# patch "packages/opie-init/opie-init_1.2.2.bb"
# from [1b39d005ccd0c0c7b0398642458f2bde6c4c31d4]
# to [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
#
# patch "packages/opie-irdaapplet/opie-irdaapplet_cvs.bb"
# from [82e388ecfed65dc597b8f8ffabd7d396965e49b3]
# to [1e718aff97398e878d897b20f3aeaaa65c1770a3]
#
# patch "packages/opie-networksettings/opie-networksettings_cvs.bb"
# from [c639caa615cc88d0a83a3617de0b970e15031e01]
# to [fdf639c975afaedf8b2ce6fc7b065b61b9205e7d]
#
# patch "packages/opie-oxygen/opie-oxygen.inc"
# from [41a6c02041cdc980c0b339290bc88b49626b17aa]
# to [081a7c525fbf5e21763448c1c9f39138f0c05fc9]
#
# patch "packages/opie-qcop/opie-qcop_cvs.bb"
# from [d13764e02934981b413d161bd405d6c388571171]
# to [c2097d44582c668bbb719ae77cb032333a4a58de]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [90f91510b34a3ea0a48e3c38214ce9c2c7b0ace6]
# to [485a535dc2b358d5755ccec0f9697b159b0bb964]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [a19fde79d9a812e04519973d4914b51d828a0cdb]
# to [f87b668c5dc754048758ef15a98e30583eb4067b]
#
============================================================
--- conf/machine/include/motorola-ezx-base.inc 0667c6b496dfb760566158b9fbbd7d6d278b90a6
+++ conf/machine/include/motorola-ezx-base.inc 0667c6b496dfb760566158b9fbbd7d6d278b90a6
@@ -0,0 +1,33 @@
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+#cat /proc/mtd
+#dev: size erasesize name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+
+#the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
+ROOT_FLASH_SIZE = "24"
+
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
+
+# Opentapi needs to be started very early so we need the mux devices in static /dev
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+ files/device_table-ezx.txt"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- packages/kazehakase/kazehakase_cvs.bb 1b5a8edcf4a52f628f27e5e38dff856525b60edc
+++ packages/kazehakase/kazehakase_cvs.bb 1b5a8edcf4a52f628f27e5e38dff856525b60edc
@@ -0,0 +1,18 @@
+DESCRIPTION = "A gtk-webcore based browser"
+HOMEPAGE = "http://kazehakase.sourceforge.jp/"
+SECTION = "x11/network"
+LICENSE = "GPLv2"
+DEPENDS = "osb-nrcit glib-2.0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/kazehakase;module=kazehakase"
+S = "${WORKDIR}/kazehakase"
+
+
+PV = "0.4.7+cvs${SRCDATE}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --disable-gtkmozembed "
+
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/opie-qcop/files/unbreak-logging.patch 78d5b44b38724d0bd7192f584e0306681ac936be
+++ packages/opie-qcop/files/unbreak-logging.patch 78d5b44b38724d0bd7192f584e0306681ac936be
@@ -0,0 +1,16 @@
+Index: opie/core/apps/qcop/qcopimpl.cpp
+===================================================================
+RCS file: /cvs/opie/core/apps/qcop/qcopimpl.cpp,v
+retrieving revision 1.2
+diff -u -r1.2 qcopimpl.cpp
+--- qcop/qcopimpl.cpp 2 Mar 2005 19:23:54 -0000 1.2
++++ qcop/qcopimpl.cpp 3 May 2007 03:09:36 -0000
+@@ -46,7 +46,7 @@
+
+ int doqcopimpl (int argc, char *argv[])
+ {
+- qInstallMsgHandler( disableqdebug );
++ //qInstallMsgHandler( disableqdebug );
+
+ if ( argc > 1 ) {
+ QString opt = argv[1];
============================================================
--- classes/opie.bbclass 63b61b5cd7a8d7d3fb50c8802c996927a4316994
+++ classes/opie.bbclass 2653571d91e93ff5043997740e80656344ad35d8
@@ -79,7 +79,7 @@ python opie_do_opie_install() {
S = bb.data.getVar( "S", d, 1 )
D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
WORKDIR = bb.data.getVar( "WORKDIR", d, True )
- palmtopdir = bb.data.getVar( "palmtopdir", d )
+ palmtopdir = bb.data.getVar( "palmtopdir", d, True )
APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
if desktopdir is not None:
============================================================
--- conf/bitbake.conf d52250874c724734f38a1342376ffb804d7a19fb
+++ conf/bitbake.conf 4481b02aa24ad52f996889ffadf4f12e9912c116
@@ -319,8 +319,8 @@ export OPIEDIR = "${STAGING_DIR}/${HOST_
export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export palmtopdir = "/opt/QtPalmtop"
-export palmqtdir = "/opt/QtPalmtop"
+export palmtopdir = "${prefix}"
+export palmqtdir = "${prefix}"
##################################################################
# Download locations and utilities.
============================================================
--- conf/distro/angstrom-2007.1.conf 59159a926215caee1cf37b3d07c5a4bcf28deb10
+++ conf/distro/angstrom-2007.1.conf 5f9d6cf541be67c463ff4f89b5de124a851e5dc5
@@ -13,7 +13,7 @@ require conf/distro/include/sane-srcdate
require conf/distro/include/sane-srcdates.inc
#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
require conf/distro/include/angstrom${ARM_ABI}.inc
#Images built can have to modes:
@@ -50,10 +50,12 @@ FEED_ARCH_c7x0 = "armv5te"
FEED_ARCH_akita = "armv5te"
FEED_ARCH_at91sam9263ek = "armv5te"
FEED_ARCH_c7x0 = "armv5te"
+FEED_ARCH_compulab-pxa270 = "armv5te"
FEED_ARCH_h2200 = "armv5te"
FEED_ARCH_h3900 = "armv5te"
FEED_ARCH_h4000 = "armv5te"
FEED_ARCH_h5000 = "armv5te"
+FEED_ARCH_htctornado = "armv5te"
FEED_ARCH_htcuniversal = "armv5te"
FEED_ARCH_hx2000 = "armv5te"
FEED_ARCH_hx4700 = "armv5te"
@@ -88,6 +90,7 @@ FEED_ARCH_simpad = "arm-oabi"
FEED_ARCH_h3600 = "arm-oabi"
FEED_ARCH_h3800 = "arm-oabi"
FEED_ARCH_simpad = "arm-oabi"
+FEED_ARCH_htcwallaby = "arm-oabi"
#Tweak packaging for strongarm machines since they can't use EABI
============================================================
--- conf/distro/include/angstrom-glibc.inc cb939b1a389e8b33c0bf4f658e709da4337a4add
+++ conf/distro/include/angstrom-glibc.inc c70c421338b418901a172a9210ea87a82ab763c0
@@ -1,9 +1,9 @@ PREFERRED_PROVIDER_virtual/libc ?= "glib
# glibc:
PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
============================================================
--- conf/distro/include/angstrom-uclibc.inc 5976f51d1a203540984b37aea9a01200c509f145
+++ conf/distro/include/angstrom-uclibc.inc acd77cb1b7ff38f08af7ea0f756e371ee8730a48
@@ -7,7 +7,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
-TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
#mess with compiler flags to use -Os instead of -O2
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 6ff359c7c5d04888f86bbdbf580342faa6b125e4
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 5f9b174bd679d8f5b634fdcde2cddde0853a9369
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
#
# Default versions
QTE_VERSION ?= "2.3.10"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070428"
+OPIE_SRCDATE ?= "20070702"
OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcdates.inc b2c78cdbf95e8492c4d56dd1afcca640d4e1bf2e
+++ conf/distro/include/sane-srcdates.inc 211037ba3b8be809090a4a8d44a0ea8d709dae7e
@@ -43,7 +43,7 @@ SRCDATE_rosetta ?= "20060804"
# GPE
SRCDATE_dasher-gpe ?= "20060814"
SRCDATE_rosetta ?= "20060804"
-SRCDATE_gpesyncd ?= "20061128"
+SRCDATE_gpesyncd ?= "20070701"
# GNOME
SRCDATE_gconf-dbus ?= "20070512"
============================================================
--- conf/machine/a1200.conf a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd
+++ conf/machine/a1200.conf 4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,2 +1,5 @@
-WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Motorola EZX A1200,\n* because \
-of the similarities between A780 and A1200 series. Use MACHINE = \"a780\".\n*\n*\n')}"
+#@TYPE: Machine
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+
+require conf/machine/include/motorola-ezx-base.inc
============================================================
--- conf/machine/a780.conf 0b4ea0352725660f6f5612a0c0cb267b0274953e
+++ conf/machine/a780.conf 4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,37 +1,5 @@
#@TYPE: Machine
#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+require conf/machine/include/motorola-ezx-base.inc
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
-
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
-#cat /proc/mtd
-#dev: size erasesize name
-#mtd0: 00020000 00008000 "Bootloader"
-#mtd1: 000e0000 00020000 "Kernel"
-#mtd2: 00580000 00020000 "VFM_Filesystem"
-#mtd3: 00020000 00020000 "Logo"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
-#the EZX phones need a userspace daemon to stop the BP from shutting down the phone
-MACHINE_EXTRA_RDEPENDS += "opentapi"
-
-ROOT_FLASH_SIZE = "24"
-
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-
-# Opentapi needs to be started very early so we need the mux devices in static /dev
-IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
- files/device_table-ezx.txt"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/e680.conf 987ace20df2d1dc626ea26f22b62e9dc7289adc5
+++ conf/machine/e680.conf 4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,2 +1,5 @@
-WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Motorola EZX E680,\n* because \
-of the similarities between A780 and E680-clamshell series. Use MACHINE = \"a780\".\n*\n*\n')}"
+#@TYPE: Machine
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+
+require conf/machine/include/motorola-ezx-base.inc
============================================================
--- conf/machine/rokr-e2.conf 3c78073478e131d6f10f163a67a8c03cd4fa6593
+++ conf/machine/rokr-e2.conf 0d6bee13f804137fbb6e3564ed46b0422b8dc682
@@ -1,33 +1,9 @@
#@TYPE: Machine
#@NAME: Motorola EZX rokr e2
#@DESCRIPTION: Machine configuration for the %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list