1 files changed, 27 insertions, 22 deletions

diff --git a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
index ab567a76d..683249860 100644
--- a/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
+++ b/meta-fsl-arm/recipes-bsp/imx-test/imx-test.inc
@@ -1,3 +1,5 @@
+# Copyright (C) 2012-2015 O.S. Systems Software LTDA.
+
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
@@ -13,12 +15,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 
 PE = "1"
 
-PLATFORM_mx6 = "IMX6Q"
-PLATFORM_mx6sl = "IMX6SL"
-PLATFORM_mx6sx = "IMX6SX"
-PLATFORM_mx53 = "IMX53"
-PLATFORM_mx51 = "IMX51"
-
 SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz"
 
 inherit module-base
@@ -26,13 +22,11 @@ inherit module-base
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-INCLUDE_DIR="-I${STAGING_INCDIR} \
-             -I${S}/include \
-             -I${STAGING_KERNEL_DIR}/include/uapi \
-             -I${STAGING_KERNEL_DIR}/include \
-             -I${STAGING_KERNEL_DIR}/arch/arm/include \
-             -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
-             -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
+PLATFORM_mx6 = "IMX6Q"
+PLATFORM_mx6sl = "IMX6SL"
+PLATFORM_mx6sx = "IMX6SX"
+PLATFORM_mx53 = "IMX53"
+PLATFORM_mx51 = "IMX51"
 
 # Required so the fixdep binary is generated
 addtask make_scripts after do_patch before do_compile
@@ -41,18 +35,29 @@ do_make_scripts[deptask] = "do_populate_sysroot"
 do_make_scripts[depends] += "virtual/kernel:do_install"
 
 do_compile() {
-        LDFLAGS="" make PLATFORM=${PLATFORM} LINUXPATH=${STAGING_KERNEL_DIR} \
-        KBUILD_OUTPUT=${STAGING_KERNEL_DIR} CROSS_COMPILE=${TARGET_PREFIX} V=1 \
-        INC="${INCLUDE_DIR}"
+    unset LDFLAGS
+    oe_runmake V=1 VERBOSE='' \
+               CROSS_COMPILE=${TARGET_PREFIX} \
+               INC="-I${STAGING_INCDIR} \
+                    -I${S}/include \
+                    -I${STAGING_KERNEL_DIR}/include/uapi \
+                    -I${STAGING_KERNEL_DIR}/include \
+                    -I${STAGING_KERNEL_DIR}/arch/arm/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
+               LINUXPATH=${STAGING_KERNEL_DIR} \
+               KBUILD_OUTPUT=${STAGING_KERNEL_DIR} \
+               PLATFORM=${PLATFORM}
 }
 
 do_install() {
-        install -d ${D}/unit_tests
-        install -m 755 test-utils.sh ${D}/unit_tests/test-utils.sh
-        install -m 755 ${S}/platform/${PLATFORM}/* ${D}/unit_tests/
-        if [ -e ${WORKDIR}/clocks.sh ]; then
-                install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
-        fi
+    oe_runmake DESTDIR=${D}/unit_tests \
+               PLATFORM=${PLATFORM} \
+               install
+
+    if [ -e ${WORKDIR}/clocks.sh ]; then
+        install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
+    fi
 }
 
 FILES_${PN} += "/unit_tests"