4 files changed, 39 insertions, 29 deletions

diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc
index 172b81c8..421deff2 100644
--- a/recipes-extended/odp/odp.inc
+++ b/recipes-extended/odp/odp.inc
@@ -4,21 +4,22 @@ DESCRIPTION = "OpenDataPlane (ODP) provides a data plane application programming
 HOMEPAGE = "http://www.opendataplane.org"
 SECTION = "console/network"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4ccfa994aa96974cfcd39a59faee20a2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=472053b942339f200d9e1d2dcb947e9d"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/odp:"
 
 SRC_URI = " \
-git://git.freescale.com/ppc/sdk/odp.git;nobranch=1 \
-git://git.freescale.com/ppc/sdk/qbman_userspace.git;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \
-git://git.freescale.com/ppc/sdk/flib.git;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \
+git://github.com/qoriq-open-source/odp.git;nobranch=1 \
+git://github.com/qoriq-open-source/qbman_userspace.git;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \
+git://github.com/qoriq-open-source/flib.git;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \
 "
-SRC_URI += "file://disable-the-Werror-flag.patch"
 
-SRCREV = "a8935384642f5da8236260dd553c52dbbc7c63ed"
-SRCREV_qbman = "0b8648d702f701417cd6cc3cbcdc228e640d20b6"
-SRCREV_rta = "bbab28b03ae21c52ce913f8b052acf53bd24ff5d"
+SRC_URI += "file://0001-Fix-this-build-error.patch"
+
+SRCREV = "fdb26cb5c751afadf2299da2a1376e6ca0e61cc7"
+SRCREV_qbman = "097595befc2bb60b733027e94ad2ed16a0e9cae0"
+SRCREV_rta = "2c9b9dc22699f7c00f24a2134c42901932a6a0b9"
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2080a|ls2088a)"
+COMPATIBLE_MACHINE = "(ls1043a|ls1046a|ls2080a|ls2088a|ls1088a)"
diff --git a/recipes-extended/odp/odp/0001-Fix-this-build-error.patch b/recipes-extended/odp/odp/0001-Fix-this-build-error.patch
new file mode 100644
index 00000000..fd276437
--- /dev/null
+++ b/recipes-extended/odp/odp/0001-Fix-this-build-error.patch
@@ -0,0 +1,28 @@
+From 9fb1642b38053de6e8098f6b608ad86ff45bf7f7 Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Fri, 28 Jul 2017 14:59:22 +0800
+Subject: [PATCH] Fix this build error
+
+fix the below error:
+|error: 'SIGEV_THREAD' undeclared (first use in this function); did you mean 'CLONE_THREAD'?
+
+Signed-off-by: Chunrong Guo <B40290@freescale.com>
+---
+ example/lpm-ipfwd/app/odp_lpmfwd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/example/lpm-ipfwd/app/odp_lpmfwd.c b/example/lpm-ipfwd/app/odp_lpmfwd.c
+index 57c5e82..f8507be 100644
+--- a/example/lpm-ipfwd/app/odp_lpmfwd.c
++++ b/example/lpm-ipfwd/app/odp_lpmfwd.c
+@@ -23,6 +23,7 @@
+ #include <errno.h>
+ #include <error.h>
+ #include <mqueue.h>
++#include <signal.h>
+ 
+ #include <example_debug.h>
+ 
+-- 
+1.8.3.2
+
diff --git a/recipes-extended/odp/odp/disable-the-Werror-flag.patch b/recipes-extended/odp/odp/disable-the-Werror-flag.patch
deleted file mode 100644
index 3ba1c060..00000000
--- a/recipes-extended/odp/odp/disable-the-Werror-flag.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch to disable the Werror flag.
-
-Werror flag is causing the code compilaton error when
-ubuntu toolchain is used to compile the code in Dash.
-This patch disables the Werror flag to avoid such errors.
-
-Signed-off-by: Sandeep Malik <Sandeep.Malik@nxp.com>
-
---- a/configure.acold   2017-04-19 17:40:58.312258373 +0800
-+++ b/configure.ac      2017-04-19 17:41:22.820257525 +0800
-@@ -249,7 +249,7 @@
- ##########################################################################
- # Default warning setup
- ##########################################################################
--ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes"
-+ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- ODP_CFLAGS="$ODP_CFLAGS -Wmissing-declarations -Wold-style-definition -Wpointer-arith"
- ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonliteral"
- ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
diff --git a/recipes-extended/odp/odp_git.bb b/recipes-extended/odp/odp_git.bb
index 32e31072..b7c7deb6 100644
--- a/recipes-extended/odp/odp_git.bb
+++ b/recipes-extended/odp/odp_git.bb
@@ -18,6 +18,7 @@ ODP_BUILD_TYPE ?= "ls2088"
 ODP_BUILD_TYPE_ls1043ardb = "ls1043"
 ODP_BUILD_TYPE_ls1046ardb = "ls1046"
 ODP_BUILD_TYPE_ls2080ardb = "ls2080"
+ODP_BUILD_TYPE_ls1088ardb = "ls1088"
 
 EXTRA_OECONF = "--with-platform=${ODP_PLATFORM} \
                 --with-sdk-install-path=${STAGING_DIR_TARGET} \
@@ -53,7 +54,6 @@ do_install_append () {
     cp -rf ${S}/platform/linux-dpaa2/kni/*.h ${D}${includedir}/odp/kni/
     cp -rf ${S}/kern/*.h ${D}${includedir}/odp/kern/
     cp -rf ${S}/platform/linux-dpaa2/flib/mc/*.h ${D}${includedir}/odp/flib/mc/
-    cp -rf ${S}/platform/linux-dpaa2/flib/qbman/include/drivers/*.h ${D}${includedir}/odp/flib/qbman/include/drivers
 
     sed -i -e 's#platform/linux-dpaa2/##g' ${D}${includedir}/odp/kern/*.h
 }