merge of '3a89dabf7f758f7d9957d9dfebb5e383d9096d6e'

     and 'fe3ce31a0e6060324326d5a27cdba01788c95b7b'

7 files changed, 16 insertions, 7 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ec8a5b9b30..4f950ffff1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -71,8 +71,8 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
 
 #Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+             	= "2.12.0"
-PREFERRED_VERSION_glib-2.0              = "2.14.0"
+PREFERRED_VERSION_gtk+             	= "2.12.3"
+PREFERRED_VERSION_glib-2.0              = "2.14.4"
 PREFERRED_VERSION_pango                 = "1.18.1"
 
 # prefer newest for speed and fun
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 02e2399e4e..d712fadb8c 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -886,7 +886,7 @@ PREFERRED_VERSION_libgalago ?= "0.3.3"
 PREFERRED_VERSION_libgc ?= "6.7"
 PREFERRED_VERSION_libgcrypt ?= "1.2.3"
 PREFERRED_VERSION_libgeda ?= "20050820"
-PREFERRED_VERSION_libgemwidget ?= "0.1"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
 PREFERRED_VERSION_libglade ?= "2.6.2"
 PREFERRED_VERSION_libglademm ?= "2.4.1"
 PREFERRED_VERSION_libgmime ?= "2.1.7"
@@ -918,7 +918,7 @@ PREFERRED_VERSION_libhildonfm ?= "1.9.41"
 PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
 PREFERRED_VERSION_libhildonmime ?= "1.9.5"
 PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
-PREFERRED_VERSION_libiac ?= "0.1"
+PREFERRED_VERSION_libiac ?= "1.0"
 PREFERRED_VERSION_libice ?= "1.0.4"
 PREFERRED_VERSION_libiconv ?= "1.11"
 PREFERRED_VERSION_libid3 ?= "1.1"
@@ -946,7 +946,7 @@ PREFERRED_VERSION_libmailwrapper ?= "1.2.3"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
 PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
 PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
-PREFERRED_VERSION_libmimedir ?= "0.3.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
 PREFERRED_VERSION_libmng ?= "1.0.8"
 PREFERRED_VERSION_libmodplug ?= "0.7"
 PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 50ba415363..c8b67efb7a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -45,7 +45,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1021"
-SRCREV_pn-linux-openmoko ?= "3801"
+SRCREV_pn-linux-openmoko ?= "4014"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 21e256b04a..559bd40c75 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -22,3 +22,7 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 PREFERRED_VERSION_u-boot = "1.1.4"
 KERNEL_IMAGETYPE = "uImage"
 
+UBOOT_ENTRYPOINT = "0x90000000"
+UBOOT_LOADADRESS = "0x10000000"
+
+
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index c4c1237bae..1f29438061 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -27,7 +27,8 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootf
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
-			      kernel-module-snd-soc-h5000"
+			      kernel-module-snd-soc-h5000 \
+			      kernel-module-i2c-pxa"
 
 #
 # Modules autoload and other boot properties
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3bc18e3f9e..27706cbd4a 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -10,6 +10,8 @@ PREFERRED_VERSION_u-boot = "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
+KERNEL_IMAGETYPE = "uImage"
+
 PREFERRED_VERSION_u-boot = "1.3.1"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index ee2c6144a9..38f3b1930c 100644
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -10,6 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
+KERNEL_IMAGETYPE = "uImage"
+
 PREFERRED_VERSION_u-boot = "1.1.6"
 UBOOT_MACHINE = "MPC8323ERDB_config"