multiprocmgr: do not mix kernel and user-space headers, fully depend on uapi

As multiprocmgr is a user-space app and should only use uapi headers, drop
extra -I for the kernel headers. Patch out any assumptions of direct access
to the kernel headers.

Cc: Suman Anna <s-anna@ti.com>
Cc: Sam Nelson <sam.nelson@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

2 files changed, 29 insertions, 2 deletions

diff --git a/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-suppress-kernel-linux-types.h-inclus.patch b/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-suppress-kernel-linux-types.h-inclus.patch
new file mode 100644
index 00000000..c3315cfc
--- /dev/null
+++ b/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-suppress-kernel-linux-types.h-inclus.patch
@@ -0,0 +1,28 @@
+From 95921ccf77ae037bb3b95f45a632f60975c6c9bb Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Tue, 11 Feb 2020 17:03:18 -0500
+Subject: [PATCH] mpmdlif.c: don't suppress kernel <linux/types.h> inclusion
+
+Defining _LINUX_TYPES_H before including <linux/keystone_remoteproc.h> causes
+<linux/types.h> to skip defining kernel types, resulting in undefined __u32
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ src/daemon/mpmdlif.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/daemon/mpmdlif.c b/src/daemon/mpmdlif.c
+index 0c31604..1abd00f 100644
+--- a/src/daemon/mpmdlif.c
++++ b/src/daemon/mpmdlif.c
+@@ -46,7 +46,6 @@
+ #include <byteswap.h>
+ #include <stdint.h>
+ 
+-#define _LINUX_TYPES_H
+ #include "linux/keystone_remoteproc.h"
+ #include "internal/rsc_types.h"
+ //#include <elf.h>
+-- 
+2.7.4
+
diff --git a/recipes-ti/multiprocmgr/multiprocmgr_git.bb b/recipes-ti/multiprocmgr/multiprocmgr_git.bb
index 6143341d..aea24456 100644
--- a/recipes-ti/multiprocmgr/multiprocmgr_git.bb
+++ b/recipes-ti/multiprocmgr/multiprocmgr_git.bb
@@ -6,6 +6,7 @@ include multiprocmgr.inc
 SRC_URI += " \
         file://mpmsrv-daemon.service \
         file://0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch \
+        file://0001-mpmdlif.c-don-t-suppress-kernel-linux-types.h-inclus.patch \
 "
 
 PR = "${INC_PR}.2"
@@ -14,8 +15,6 @@ DEPENDS = "mpm-transport libdaemon virtual/kernel cmem"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-CC += "-I${STAGING_KERNEL_DIR}/include -I${STAGING_KERNEL_DIR}/include/uapi"
-
 INITSCRIPT_NAME = "mpmsrv-daemon.sh"
 INITSCRIPT_PARAMS = "defaults 10"