Merge remote branch 'denzil' into master

* freescale/denzil:
  linux-imx (2.6.35.3): fix copy of native binaries onto sysroot
  u-boot: change mx53loco default environment

2 files changed, 6 insertions, 2 deletions

diff --git a/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/recipes-bsp/u-boot/u-boot_2012.04.01.bb
index e58e8f5..82c79bb 100644
--- a/recipes-bsp/u-boot/u-boot_2012.04.01.bb
+++ b/recipes-bsp/u-boot/u-boot_2012.04.01.bb
@@ -6,10 +6,10 @@ COMPATIBLE_MACHINE = "(imx28evk|mx5|mx6)"
 
 DEPENDS_mxs += "elftosb-native"
 
-SRCREV = "be3fa4a375427dbc153d044b8743b786b2dd4393"
+SRCREV = "4e6e82429c127d6084b3a3cde5f2f2c4ea63440b"
 
 PV = "v2012.04.01"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
 
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 33582e9..c8498ff 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -67,6 +67,10 @@ do_install_append() {
 
 sysroot_stage_all_append() {
         sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}/kernel
+
+        # Copy native binaries need for imx-test build onto sysroot
+        mkdir -p ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic \
+                 ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod
         cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic
         cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod
 }