merge of '55c714e37be4606a4166b3df883d5f404d3889bf'

     and 'd714000fc8a6b75093a93f01782724b65d31eac1'

15 files changed, 94 insertions, 29 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index c78e149e6d..d291fbd3ac 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -312,7 +312,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 PREFERRED_VERSION_busybox = "1.2.1"
 
 PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib ?= "0.74"
 
 PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 60557325a9..cdf2970201 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -8,7 +8,7 @@
 
 
 # Use Xorg R7.3 release
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
 
 # This is a testbed for unstable and/or untested things, while angstrom-2007.1 
@@ -42,3 +42,6 @@ PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
 PREFERRED_VERSION_pango                 = "1.18.1"
 
+# prefer newest for speed and fun
+PREFERRED_VERSION_udev			= "115"
+
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3330ecff4d..008881ed99 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -17,12 +17,12 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
-SRCREV_pn-hildon-1 ?= "13708"
-SRCREV_pn-libgsmd ?= "2957"
+SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-libgsmd ?= "3074"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "3032"
+SRCREV_pn-libmokoui2 ?= "3064"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -33,7 +33,7 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649"
 SRCREV_pn-matchbox-keyboard ?= "1675"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_moko-gtk-engine ?= "3029"
+SRCREV_pn-moko-gtk-engine ?= "3069"
 SRCREV_pn-neod ?= "2956"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
@@ -41,27 +41,28 @@ SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-browser2 ?= "3031"
+SRCREV_pn-openmoko-appmanager2 ?= "3090"
+SRCREV_pn-openmoko-browser2 ?= "3082"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "2789"
 SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "2679"
 SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "335"
+SRCREV_pn-openmoko-contacts2 ?= "350"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2976"
-SRCREV_pn-openmoko-feedreader2 ?= "2944"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
+SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -69,7 +70,7 @@ SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "2936"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"
@@ -79,14 +80,14 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-tasks2 ?= "343"
 SRCREV_pn-openmoko-terminal2 ?= "2972"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2 ?= "3044"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
-SRCREV_pn-openmoko-today ?= "2556"
-SRCREV_pn-openmoko-today2 ?= "2955"
+SRCREV_pn-openmoko-today ?= "3056"
+SRCREV_pn-openmoko-today2 ?= "3088"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
@@ -94,7 +95,9 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1615"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
-SRCREV_pn-webkit-gtk ?= "25615"
+SRCREV_pn-webkit-gtk ?= "26079"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
 
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 06d5946523..0f5eaca9cc 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -6,6 +6,8 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
+MACHINE_FEATURES += "iwmmxt"
+
 IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/cm-x270.conf
index ff0eb42a11..c712c3728e 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/cm-x270.conf
@@ -1,12 +1,12 @@
 #@TYPE: Machine
-#@Name: Compulab PXA270 system
-#@DESCRIPTION: Machine configuration for Compulab PXA270 system
+#@Name: Compulab cm-x270
+#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
 PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 require conf/machine/include/tune-xscale.inc
@@ -21,7 +21,7 @@ CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
-# the following is the for the cm-x270 L module
+# the following is the port for the cm-x270 L module
 # I think the W module would use ttyS0, but has
 # not been tested.  This can be overwritten in 
 # local.conf
diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf
new file mode 100644
index 0000000000..211091d929
--- /dev/null
+++ b/conf/machine/er0100.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: iRex Iliad e-ink reader
+#@DESCRIPTION: Machine configuration for the iRex Iliad e-ink reader
+
+#
+# Hardware-based properties
+#
+
+# CPU: Intel (now Marvell) PXA255
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+# Fix us:
+
+#ROOT_FLASH_SIZE = "80"
+#VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "768"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "1024"
+MACHINE_FEATURES = "kernel24 touchscreen apm alsa pcmcia wifi usbgadget usbhost screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-er0100"
+PCMCIA_MANAGER = "pcmcia-cs"
+MODUTILS = "24"	
+XSERVER = "xserver-kdrive-fbdev"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_pcmcia = "pcmcia"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+USE_VT = "0"
+SERIAL_CONSOLE = "-L ttyS2 115200 vt100"
+
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 634b388f96..c3e7cf710e 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -18,6 +18,7 @@ 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"
+MACHINE_FEATURES += "iwmmxt"
 
 #
 # Software/packages selection
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 141470b5a4..87e03a7bdd 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -20,6 +20,7 @@ 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"
+MACHINE_FEATURES += "iwmmxt"
 
 #
 # Software/packages selection
@@ -29,7 +30,6 @@ PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
 
 XSERVER = "xserver-kdrive-w100"
-PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 4f66f92cf0..fc5fd4e136 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -13,6 +13,7 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_gumstix_gadget = "gumstix_gadget"
 module_autoload_g_ether = "g_ether"
 module_autoload_smc91x = "smc91x"
+module_autoload_smc911x = "smc911x"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
@@ -33,8 +34,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-sysfs \
                              kernel-module-smc91x \
                              kernel-module-gumstix-smc91x \
-                             "          
-
+                             kernel-module-smc911x \
+                             kernel-module-gumstix-smc911x \
+                             "
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 3912d8fc9b..87571c0db0 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -12,6 +12,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 #mtd3: 00020000 00020000 "Logo"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
+
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 60cc9af3d1..f7451cccb0 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -20,6 +20,8 @@ MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
+MACHINE_FEATURES += "iwmmxt"
+
 
 #
 # We don't support jffs2 installations (yet).
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 2f92eb4158..bbeaf3a4a2 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -10,6 +10,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "320"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
+MACHINE_FEATURES += "iwmmxt"
 
 
 MACHINE_EXTRA_RRECOMMENDS += "\
diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf
index 621e95f166..1a99c877ce 100644
--- a/conf/machine/rokre2.conf
+++ b/conf/machine/rokre2.conf
@@ -6,3 +6,5 @@ require conf/machine/include/motorola-ezx-base.inc
 
 # there is no touchscreen
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf
index 7b20091140..044a65c9fa 100644
--- a/conf/machine/rokre6.conf
+++ b/conf/machine/rokre6.conf
@@ -4,5 +4,3 @@
 
 require conf/machine/include/motorola-ezx-base.inc
 
-# there is no touchscreen
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 3199065606..32060d090c 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,6 +5,8 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
+MACHINE_FEATURES += "iwmmxt"
+
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt"