6 files changed, 11 insertions, 7 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5696dbfbaa..0c12269d0d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14482,6 +14482,10 @@ sha256=30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
 md5=9df9d2b3304213641d3214a774d75ee1
 sha256=47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.26/libsoup-2.26.2.tar.bz2]
+md5=61abd9bf1435e37def0956248a03832c
+sha256=afcedda15bde2395dec31a82a243871a0540ea2e13e7a14d15846ad0c1f09a7b
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7a4229018f..9f97b509f1 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -136,7 +136,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-midori ?= "c41845b907b72e6c255a519c621f2382cba67b44"
+SRCREV_pn-midori ?= "3179a538a947cbd7612cac346e3e0c7c3d0e03cd"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
@@ -254,7 +254,7 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "44489"
+SRCREV_pn-webkit-gtk ?= "44523"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
@@ -266,7 +266,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "40903"
+EFL_SRCREV ?= "40978"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
index d509152b22..9ef4ff7c7d 100644
--- a/conf/machine/dm355-evm.conf
+++ b/conf/machine/dm355-evm.conf
@@ -4,4 +4,4 @@
 
 require conf/machine/include/davinci.inc
 
-UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_dm355_evm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 09f4a353ca..de2cc4a759 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -4,4 +4,4 @@
 
 require conf/machine/include/davinci.inc
 
-UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf
index 66ed1fe1f2..a7596f17f8 100644
--- a/conf/machine/dm6467-evm.conf
+++ b/conf/machine/dm6467-evm.conf
@@ -4,4 +4,4 @@
 
 require conf/machine/include/davinci.inc
 
-UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_dm6467_evm_config"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 3134c28d18..af9dc0ff9c 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -9,7 +9,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
 
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "davinci_dvevm_config"
 
 UBOOT_ENTRYPOINT = "0x80008000"