usdpaa: update to sdk v1.6 release

1. Added a new variable for the FMan version so that the usdpaa applications to
   correctly use the fmlib interface.
2. Unify the indentation character, replace tab with space 4 character
3. add support for new added boards

Signed-off-by: Ting Liu <b28495@freescale.com>

diff --git a/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb b/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb
index 8288b2a1c78924544c2a695e4baf650fd334ac4c..9c7e38827e031c0ce2c618d50ef89677a57e5a29 100644 (file)
--- a/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -8,12 +8,13 @@ inherit pkgconfig
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "libxml2 libedit ncurses readline flib fmc"
+DEPENDS_append_b4860qds = " ipc-ust"
+DEPENDS_append_b4420qds = " ipc-ust"
+
 RDEPENDS_${PN} = "libgcc bash"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/usdpaa.git;nobranch=1"
-SRCREV = "cc8e332c64e5840ea2037624159801284434caba"
-SRCREV_t2080qds = "e6659c7a473fbaa64313c941d5fb10c723c64731"
-SRCREV_t2080qds-64b = "e6659c7a473fbaa64313c941d5fb10c723c64731"
+SRCREV = "db3534f4d21892bc7f9fbe973f4e4cf8de924c75"
 
 S = "${WORKDIR}/git"
 
@@ -21,26 +22,50 @@ EXTRA_OEMAKE = 'CC="${CC}" LD="${LD}" AR="${AR}"'
 export ARCH="${TARGET_ARCH}"
 
 do_compile_prepend () {
-       case ${MACHINE} in
-               b4420qds|b4420qds-64b|b4860qds|b4860qds-64b) SOC=B4860;;
-               t4240qds|t4240qds-64b) SOC=T4240;;
-               p1023rdb) SOC=P1023;;
-               *) SOC=P4080;;
-       esac
-       export FMC_EXTRA_CFLAGS="-I ${STAGING_INCDIR}/fmc"
-       export FMLIB_EXTRA_CFLAGS="-I ${STAGING_INCDIR}/fmd \
-               -I ${STAGING_INCDIR}/fmd/Peripherals \
-               -I ${STAGING_INCDIR}/fmd/integrations \
-               -D $SOC"
-
-       export LIBXML2_CFLAGS="$(pkg-config --cflags libxml-2.0)"
-       export LIBXML2_LDFLAGS="$(pkg-config --libs --static libxml-2.0)"
-       export LIBEDIT_CFLAGS="$(pkg-config --cflags libedit)"
-       export LIBEDIT_LDFLAGS="$(pkg-config --libs --static libedit)"
+    case ${MACHINE} in
+        b4420qds|b4420qds-64b|b4860qds|b4860qds-64b)
+            SOC=B4860;
+            FMAN_VARIANT=B4860;;
+        t1040qds|t1040qds-64b|t1040rdb|t1040rdb-64b)
+            SOC=T1040;
+            FMAN_VARIANT=B4860;;
+        t2080qds|t2080qds-64b|t2080rdb|t2080rdb-64b)
+            SOC=T2080;
+            FMAN_VARIANT=B4860;;
+        t4240qds|t4240qds-64b|t4240rdb|t4240rdb-64b)
+            SOC=T4240;
+            FMAN_VARIANT=B4860;;
+        p1023rdb)
+            SOC=P1023;
+            FMAN_VARIANT=P1023;;
+        *)
+            SOC=P4080;
+            FMAN_VARIANT=P4080;;
+    esac
+    export SOC=$SOC
+    export FMC_EXTRA_CFLAGS="-I ${STAGING_INCDIR}/fmc"
+    export FMLIB_EXTRA_CFLAGS="-I ${STAGING_INCDIR}/fmd \
+        -I ${STAGING_INCDIR}/fmd/Peripherals \
+        -I ${STAGING_INCDIR}/fmd/integrations \
+        -D$FMAN_VARIANT"
+
+    export LIBXML2_CFLAGS="$(pkg-config --cflags libxml-2.0)"
+    export LIBXML2_LDFLAGS="$(pkg-config --libs --static libxml-2.0)"
+    export LIBEDIT_CFLAGS="$(pkg-config --cflags libedit)"
+    export LIBEDIT_LDFLAGS="$(pkg-config --libs --static libedit)"
 }
 
 do_install () {
-       oe_runmake install DESTDIR=${D}
+    case ${MACHINE} in
+        b4420qds|b4420qds-64b|b4860qds|b4860qds-64b) SOC=B4860;;
+        t1040qds|t1040qds-64b|t1040rdb|t1040rdb-64b) SOC=T1040;;
+        t2080qds|t2080qds-64b|t2080rdb|t2080rdb-64b) SOC=T2080;;
+        t4240qds|t4240qds-64b|t4240rdb|t4240rdb-64b) SOC=T4240;;
+        p1023rdb) SOC=P1023;;
+        *) SOC=P4080;;
+    esac
+    export SOC=$SOC
+    oe_runmake install DESTDIR=${D}
 }
 
 PARALLEL_MAKE_pn-${PN} = ""