merge of 29e89051e9a2c503357df607dde2562d060d5989

     and 69b99cade429033901bed0a58c27d6c6537ba35b

5 files changed, 221 insertions, 10 deletions

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 67e2aef263..a5dd6eaca2 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -11,7 +11,8 @@ export FEED_URLS_jlime = "donkey##http://www.jlime.com/downloads/releases/donkey
 #<>
 #<> We will set CVS DATE when things are known to work.
 #<>
-SRCDATE = "20060627"
+#SRCDATE = "20060627"
+
 PREFERRED_PROVIDERS  =  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}g++:gcc-cross"
@@ -76,10 +77,14 @@ BOOTSTRAP_EXTRA_DEPENDS  += "pcmciautils ncurses nano wireless-tools console-too
                              e2tools e2fsprogs kernel-modules"
 
 #<>
-#<>What Opie version should we use.
+#<>What Qte, libqte.. versions should we use.
 #<>
-#OPIE_VERSION = "1.2.3" // use cvsdate for now
-#include conf/distro/preferred-opie-versions.inc  
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
+PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
+OPIE_VERSION = "20060705"
+include conf/distro/preferred-opie-cvs-versions.inc
 
 #<>
 #<> We want pcmciautils, not pcmcia-cs
diff --git a/conf/distro/preferred-opie-cvs-versions.inc b/conf/distro/preferred-opie-cvs-versions.inc
new file mode 100644
index 0000000000..030b9522b1
--- /dev/null
+++ b/conf/distro/preferred-opie-cvs-versions.inc
@@ -0,0 +1,206 @@
+#
+# Default versions
+QTE_VERSION ?= "2.3.10"
+# OPIE_VERSION ?= "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+#
+#
+# Opie libraries
+#
+PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
+PREFERRED_VERSIION_qte-mt = "${QTE_VERSION}"
+PREFERRED_VERSION_qte = "${QTE_VERSION}"
+SRCDATE_libopie2 = "${OPIE_VERSION}"
+SRCDATE_libopieobex0 = "${OPIE_VERSION}"
+SRCDATE_libopietooth1 = "${OPIE_VERSION}"
+SRCDATE_libqpe-opie = "${OPIE_VERSION}"
+SRCDATE_libqtaux2 = "${OPIE_VERSION}"
+SRCDATE_libmailwrapper = "${OPIE_VERSION}"
+#
+# Opie applications
+#
+SRCDATE_opie-aboutapplet = "${OPIE_VERSION}"
+SRCDATE_opie-adressbook = "${OPIE_VERSION}"
+SRCDATE_opie-advancedfm = "${OPIE_VERSION}"
+SRCDATE_opie-alarm = "${OPIE_VERSION}"
+SRCDATE_opie-appearance = "${OPIE_VERSION}"
+SRCDATE_opie-aqpkg = "${OPIE_VERSION}"
+SRCDATE_opie-autorotateapplet = "${OPIE_VERSION}"
+SRCDATE_opie-backgammon = "${OPIE_VERSION}"
+SRCDATE_opie-backup = "${OPIE_VERSION}"
+SRCDATE_opie-bartender = "${OPIE_VERSION}"
+SRCDATE_opie-batteryapplet = "${OPIE_VERSION}"
+SRCDATE_opie-bluepin = "${OPIE_VERSION}"
+SRCDATE_opie-bluetoothapplet = "${OPIE_VERSION}"
+SRCDATE_opie-bluetoothmanager = "${OPIE_VERSION}"
+SRCDATE_opie-bounce = "${OPIE_VERSION}"
+SRCDATE_opie-brightnessapplet = "${OPIE_VERSION}"
+SRCDATE_opie-button-settings = "${OPIE_VERSION}"
+SRCDATE_opie-buzzword = "${OPIE_VERSION}"
+SRCDATE_opie-calculator = "${OPIE_VERSION}"
+SRCDATE_opie-calibrate = "${OPIE_VERSION}"
+SRCDATE_opie-camera = "${OPIE_VERSION}"
+SRCDATE_opie-cardmon = "${OPIE_VERSION}"
+SRCDATE_opie-checkbook = "${OPIE_VERSION}"
+SRCDATE_opie-citytime = "${OPIE_VERSION}"
+SRCDATE_opie-clipboardapplet = "${OPIE_VERSION}"
+SRCDATE_opie-clockapplet = "${OPIE_VERSION}"
+SRCDATE_opie-clock = "${OPIE_VERSION}"
+SRCDATE_opie-confeditor = "${OPIE_VERSION}"
+SRCDATE_opie-console = "${OPIE_VERSION}"
+SRCDATE_opie-dagger = "${OPIE_VERSION}"
+SRCDATE_opie-dasher = "${OPIE_VERSION}"
+SRCDATE_opie-datebook = "${OPIE_VERSION}"
+SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
+SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
+SRCDATE_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
+SRCDATE_opie-deco-flat = "${OPIE_VERSION}"
+SRCDATE_opie-deco-liquid = "${OPIE_VERSION}"
+SRCDATE_opie-deco-polished = "${OPIE_VERSION}"
+SRCDATE_opie-doctab = "${OPIE_VERSION}"
+SRCDATE_opie-drawpad = "${OPIE_VERSION}"
+SRCDATE_opie-dvorak = "${OPIE_VERSION}"
+SRCDATE_opie-embeddedkonsole = "${OPIE_VERSION}"
+SRCDATE_opie-euroconv = "${OPIE_VERSION}"
+SRCDATE_opie-examples-python = "${OPIE_VERSION}"
+SRCDATE_opie-eye = "${OPIE_VERSION}"
+SRCDATE_opie-fifteen = "${OPIE_VERSION}"
+SRCDATE_opie-formatter = "${OPIE_VERSION}"
+SRCDATE_opie-freetype = "${OPIE_VERSION}"
+SRCDATE_opie-ftplib = "${OPIE_VERSION}"
+SRCDATE_opie-ftp = "${OPIE_VERSION}"
+SRCDATE_opie-go = "${OPIE_VERSION}"
+SRCDATE_opie-gutenbrowser = "${OPIE_VERSION}"
+SRCDATE_opie-handwriting = "${OPIE_VERSION}"
+SRCDATE_opie-helpbrowser = "${OPIE_VERSION}"
+SRCDATE_opie-help-en = "${OPIE_VERSION}"
+SRCDATE_opie-homeapplet = "${OPIE_VERSION}"
+SRCDATE_opie-i18n = "${OPIE_VERSION}"
+SRCDATE_opie-lrelease-native = "${OPIE_VERSION}"
+SRCDATE_opie-lupdate-native = "${OPIE_VERSION}"
+SRCDATE_opie-icon-reload = "${OPIE_VERSION}"
+SRCDATE_opie-irc = "${OPIE_VERSION}"
+SRCDATE_opie-irdaapplet = "${OPIE_VERSION}"
+SRCDATE_opie-jumpx = "${OPIE_VERSION}"
+SRCDATE_opie-kbill = "${OPIE_VERSION}"
+SRCDATE_opie-kcheckers = "${OPIE_VERSION}"
+SRCDATE_opie-keyboard = "${OPIE_VERSION}"
+SRCDATE_opie-keypebble = "${OPIE_VERSION}"
+SRCDATE_opie-keytabs = "${OPIE_VERSION}"
+SRCDATE_opie-keyview = "${OPIE_VERSION}"
+SRCDATE_opie-kjumpx = "${OPIE_VERSION}"
+SRCDATE_opie-kpacman = "${OPIE_VERSION}"
+SRCDATE_opie-language = "${OPIE_VERSION}"
+SRCDATE_opie-launcher-settings = "${OPIE_VERSION}"
+SRCDATE_opie-libqrsync = "${OPIE_VERSION}"
+SRCDATE_opie-light-and-power = "${OPIE_VERSION}"
+SRCDATE_opie-lockapplet = "${OPIE_VERSION}"
+SRCDATE_opie-login = "${OPIE_VERSION}"
+SRCDATE_opie-logoutapplet = "${OPIE_VERSION}"
+SRCDATE_opie-mailapplet = "${OPIE_VERSION}"
+SRCDATE_opie-mail = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1 = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2 = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}"
+SRCDATE_opie-mediummount = "${OPIE_VERSION}"
+SRCDATE_opie-memoryapplet = "${OPIE_VERSION}"
+SRCDATE_opie-mindbreaker = "${OPIE_VERSION}"
+SRCDATE_opie-minesweep = "${OPIE_VERSION}"
+SRCDATE_opie-mobilemsg = "${OPIE_VERSION}"
+SRCDATE_opie-multikeyapplet = "${OPIE_VERSION}"
+SRCDATE_opie-multikey = "${OPIE_VERSION}"
+SRCDATE_opie-networkapplet = "${OPIE_VERSION}"
+SRCDATE_opie-networksettings = "${OPIE_VERSION}"
+SRCDATE_opie-notesapplet = "${OPIE_VERSION}"
+SRCDATE_opie-odict = "${OPIE_VERSION}"
+SRCDATE_opie-osearch = "${OPIE_VERSION}"
+SRCDATE_opie-oxygen = "${OPIE_VERSION}"
+SRCDATE_opie-oyatzee = "${OPIE_VERSION}"
+SRCDATE_opie-packagemanager = "${OPIE_VERSION}"
+SRCDATE_opie-parashoot = "${OPIE_VERSION}"
+SRCDATE_opie-pcmciaapplet = "${OPIE_VERSION}"
+SRCDATE_opie-performance = "${OPIE_VERSION}"
+SRCDATE_opie-pickboard = "${OPIE_VERSION}"
+SRCDATE_opie-pics = "${OPIE_VERSION}"
+SRCDATE_opie-pimconverter = "${OPIE_VERSION}"
+SRCDATE_opie-powerchord = "${OPIE_VERSION}"
+SRCDATE_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+SRCDATE_opie-qasteroids = "${OPIE_VERSION}"
+SRCDATE_opie-qcop = "${OPIE_VERSION}"
+SRCDATE_opie-quicklauncher = "${OPIE_VERSION}"
+SRCDATE_opie-qss = "${OPIE_VERSION}"
+SRCDATE_opie-rdesktop = "${OPIE_VERSION}"
+SRCDATE_opie-reader = "${OPIE_VERSION}"
+SRCDATE_opie-recorder = "${OPIE_VERSION}"
+SRCDATE_opie-remote = "${OPIE_VERSION}"
+SRCDATE_opie-restartapplet2 = "${OPIE_VERSION}"
+SRCDATE_opie-restartapplet = "${OPIE_VERSION}"
+SRCDATE_opie-restartapplet = "${OPIE_VERSION}"
+SRCDATE_opie-rotateapplet = "${OPIE_VERSION}"
+SRCDATE_opie-screenshotapplet = "${OPIE_VERSION}"
+SRCDATE_opie-search = "${OPIE_VERSION}"
+SRCDATE_opie-security = "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-blueping = "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-dummy = "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-notice = "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-pin = "${OPIE_VERSION}"
+SRCDATE_opie-sfcave = "${OPIE_VERSION}"
+SRCDATE_opie-sheet = "${OPIE_VERSION}"
+SRCDATE_opie-sh = "${OPIE_VERSION}"
+SRCDATE_opie-showimg = "${OPIE_VERSION}"
+SRCDATE_opie-snake = "${OPIE_VERSION}"
+SRCDATE_opie-solitaire = "${OPIE_VERSION}"
+SRCDATE_opie-sshkeys = "${OPIE_VERSION}"
+SRCDATE_opie-style-flat = "${OPIE_VERSION}"
+SRCDATE_opie-style-fresh = "${OPIE_VERSION}"
+SRCDATE_opie-style-liquid = "${OPIE_VERSION}"
+SRCDATE_opie-style-metal = "${OPIE_VERSION}"
+SRCDATE_opie-style-phase = "${OPIE_VERSION}"
+SRCDATE_opie-style-web = "${OPIE_VERSION}"
+SRCDATE_opie-sounds = "${OPIE_VERSION}"
+SRCDATE_opie-suspendapplet = "${OPIE_VERSION}"
+SRCDATE_opie-symlinker = "${OPIE_VERSION}"
+SRCDATE_opie-sysinfo = "${OPIE_VERSION}"
+SRCDATE_opie-systemtime = "${OPIE_VERSION}"
+SRCDATE_opie-tableviewer = "${OPIE_VERSION}"
+SRCDATE_opie-tabmanager = "${OPIE_VERSION}"
+SRCDATE_opie-taskbar = "${OPIE_VERSION}"
+SRCDATE_opie-tetrix = "${OPIE_VERSION}"
+SRCDATE_opie-textedit = "${OPIE_VERSION}"
+SRCDATE_opie-theme = "${OPIE_VERSION}"
+SRCDATE_opie-tictac = "${OPIE_VERSION}"
+SRCDATE_opie-tinykate = "${OPIE_VERSION}"
+SRCDATE_opie-today-addressbookplugin = "${OPIE_VERSION}"
+SRCDATE_opie-today-datebookplugin = "${OPIE_VERSION}"
+SRCDATE_opie-today-fortuneplugin = "${OPIE_VERSION}"
+SRCDATE_opie-today-mailplugin = "${OPIE_VERSION}"
+SRCDATE_opie-today = "${OPIE_VERSION}"
+SRCDATE_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+SRCDATE_opie-today-todolistplugin = "${OPIE_VERSION}"
+SRCDATE_opie-today-weatherplugin = "${OPIE_VERSION}"
+SRCDATE_opie-todo = "${OPIE_VERSION}"
+SRCDATE_opie-tonleiter = "${OPIE_VERSION}"
+SRCDATE_opie-unikeyboard = "${OPIE_VERSION}"
+SRCDATE_opie-usermanager = "${OPIE_VERSION}"
+SRCDATE_opie-vmemo = "${OPIE_VERSION}"
+SRCDATE_opie-vmemo-settings = "${OPIE_VERSION}"
+SRCDATE_opie-volumeapplet = "${OPIE_VERSION}"
+SRCDATE_opie-vtapplet = "${OPIE_VERSION}"
+SRCDATE_opie-wellenreiter = "${OPIE_VERSION}"
+SRCDATE_opie-wirelessapplet = "${OPIE_VERSION}"
+SRCDATE_opie-wordgame = "${OPIE_VERSION}"
+SRCDATE_opie-write = "${OPIE_VERSION}"
+SRCDATE_opie-zkbapplet = "${OPIE_VERSION}"
+SRCDATE_opie-zlines = "${OPIE_VERSION}"
+SRCDATE_opie-zsafe = "${OPIE_VERSION}"
+SRCDATE_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf
index e46796fede..535c914a9d 100644
--- a/conf/machine/include/tune-iwmmxt.conf
+++ b/conf/machine/include/tune-iwmmxt.conf
@@ -1,6 +1,6 @@
 # Configurations for the Intel PXA27x Appications Processor Family. 
 # Please use tune-xscale for PXA255/PXA26x based processors.
 IPKG_EXTRA_ARCHS += "iwmmxt"
-TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt"
+TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt "
 PACKAGE_ARCH = "iwmmxt"
 
diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 24e23bc9a0..206958c2ce 100644
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -7,8 +7,9 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5"
 GUI_MACHINE_CLASS = "smallscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-include conf/machine/include/tune-iwmmxt.conf
+include conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -16,4 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
 # EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000"
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000"
+
 
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index de242242a7..357e286752 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -9,7 +9,7 @@ IPKG_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-include conf/machine/include/tune-iwmmxt.conf
+include conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -18,6 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0"
 ROOT_FLASH_SIZE = "32"
 
 
-
-
-