Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 45 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 93e3738bca..948a4bfbd7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -178,6 +178,10 @@ sha256=fe044ec9817a31f2b76f701b2cfd980809676943a901ba3d49200162807fa1f9
 md5=82c698151f934eb28c65d1838cee7d9e
 sha256=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7
 
+[http://hal.freedesktop.org/releases/DeviceKit-003.tar.gz]
+md5=8b311547f4a2c8c6b6598e3318d66cd7
+sha256=d2d21f995d1a152ca2d8beea6d37f31e48cca034b82ceb7322f39422e849e9cf
+
 [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz]
 md5=2449bfe21d6589c96eebf94dae24df6b
 sha256=3cebe0a6894daee3bfa5d9619fc90e7619cb6a77ac1b04d027341cd6033ae989
@@ -7130,6 +7134,10 @@ sha256=719f2bbd79d55cdd6f5e31b49cec49df71ddb32a4439dba678de0e09330096da
 md5=18be4e7a1ac713bda93d00fee20bbef8
 sha256=c119ce82f0e42d3412420c42c1ead75e0b9de67131a5c9dd3cdab509f65ddfdd
 
+[http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2]
+md5=8a5cf43042a84ec0da0aca301bd1dae4
+sha256=2c8bbd8cc3323899e698fad071cc0e4e8880c178deaa849073ca4a2c9bc176f2
+
 [ftp://ftp.gnu.org/gnu/gdb/gdb-6.7.1.tar.gz]
 md5=7a74dcafdd39d18678e5b5cc2c50bb0c
 sha256=66e6ff871a7ed71ea433b8341ffebbe48590119e43a42953d392f5ce517c95e4
@@ -7878,6 +7886,10 @@ sha256=9605f7aee1b8d58cac10dd514c2bdfa340089d85b149db828816d18ac3ebaff8
 md5=4a7c977086af47fe43ea08b29ab93503
 sha256=939c8a8f819b8c39e4e355a764b2a47c6959d57029c5134a51a282d7cccd60c5
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.27/gnome-bluetooth-2.27.4.tar.bz2]
+md5=e34180aa90d5d718b819572b21b76d08
+sha256=250fede462d5ec0576c0ab9c7f965fb56dc5de6e1180405da8cf0e867a2eca3a
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.18/gnome-common-2.18.0.tar.bz2]
 md5=567172e685fc0783b1d6ab9843a85d6a
 sha256=ba28c1017e7e4212db16ada3f44cb446b6637c9c4fe16c0e2c2a51c94c46bc5b
@@ -9998,6 +10010,10 @@ sha256=bbe44edc3d519028761a22b282b912ab8f43db2003c6791c295c4a52f5db48bf
 md5=31d1f505afe3ba1b351e18612aa57a70
 sha256=bbe44edc3d519028761a22b282b912ab8f43db2003c6791c295c4a52f5db48bf
 
+[http://downloads.sourceforge.net/haserl/haserl-0.9.25.tar.gz]
+md5=906c634a2af4ac3a4b656ef4e244c4cd
+sha256=d33ba27082c8bc4427ccebd8a56cf9aef190391f0361398197efb03210910f0e
+
 [http://www.server-side.de/download/havp-0.82.tar.gz]
 md5=9e6a16b7d074782d1c62f1f7316e56ab
 sha256=e2db8d3383cd8eca6a18ebee85875de895f3ac7414eab091a87f052d79a87b09
@@ -22806,6 +22822,10 @@ sha256=5cd64b5ac52720a7f60015e01696422277ecc459e89dce8b16d457f30a9409ab
 md5=cb11d3d74eee4d31124523d90d8c31fa
 sha256=0c0afa2816482e087987f71958b656ff0c122032f5e3897a8d17daca5bc14115
 
+[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.03.tar.bz2]
+md5=285e2184d2efef50e0fe43b71d2a7b11
+sha256=a2889bee9c45575b284564dbc27cf3dc6cb9833d4ff643976a1b3dba2d763f86
+
 [http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz]
 md5=49c07dec9e1be69fd01d46f47ec03731
 sha256=a090786113b02647413ebc15888af269f2e6d50f73cbb94b0619cc1702911dae
@@ -22910,6 +22930,10 @@ sha256=cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7
 md5=a3fcdcd21b2f33d598f45a68fff892bd
 sha256=ee3922bd46dbdc406be5d498be5bc062a0b39f05f1c0a1b22c3657eb0e805975
 
+[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-141.tar.gz]
+md5=86382b7bbc64459e714c65a2a4e10916
+sha256=001be4a8963c48e7debc82c6078562d087a2979da63e558a5e3613c03725c377
+
 [http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz]
 md5=2d7e548820d2ded5e183933cb701defb
 sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 333abf423c..2734271267 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -257,7 +257,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39916"
+EFL_SRCREV ?= "40087"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/machine/hipox.conf b/conf/machine/hipox.conf
index 728ad2bb0d..f3a31cf63b 100644
--- a/conf/machine/hipox.conf
+++ b/conf/machine/hipox.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 KERNEL_IMAGETYPE = "uImage"
 
-PREFERRED_VERSION_u-boot = "1.1.2"
+PREFERRED_VERSION_u-boot = "2009.03"
 UBOOT_LOADADDRESS = "0x48008000"
 UBOOT_ENTRYPOINT = "0x48008000"
 UBOOT_ARCH = "arm"
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
new file mode 100644
index 0000000000..17aa0d310a
--- /dev/null
+++ b/conf/machine/micro2440.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: FriendlyARM micro2440
+#@DESCRIPTION: Machine configuration for FriendlyARM micro2440 Samsung 2440 based board
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_FSTYPES = "jffs2 tar.gz"
+
+MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet"
+
+require conf/machine/include/tune-arm920t.inc
+
+KERNEL_IMAGETYPE = "uImage"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -s 0x200 -n"