From dfe8ef9123936d2c1d5da34f63f661849171d5ef Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Sun, 3 Oct 2021 16:39:29 -0700
Subject: [PATCH] Fix ion.h header inclusion to be standard

NXP "solution" was to manually copy the header to include/linux.
Let's point the Makefile to the proper (mainline) location instead:
https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
---
 Makefile_G1G2                                             | 4 ++--
 Makefile_H1                                               | 4 ++--
 decoder_sw/software/linux/dwl/dwl_linux.c                 | 2 +-
 h1_encoder/software/linux_reference/ewl/ewl_x280_common.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile_G1G2 b/Makefile_G1G2
index 8f83391..25884fa 100755
--- a/Makefile_G1G2
+++ b/Makefile_G1G2
@@ -10,8 +10,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
 
 INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
 #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
-#INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
-INCLUDE_HEADERS += -I$(SDKTARGETSYSROOT)/usr/include/imx
+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
 
 CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
            -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \
diff --git a/Makefile_H1 b/Makefile_H1
index 0979571..479940a 100755
--- a/Makefile_H1
+++ b/Makefile_H1
@@ -17,8 +17,8 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\"
 #ENV += -DSDRAM_LM_BASE=0x00000000
 ENV += -DEWL_NO_HW_TIMEOUT
 ENV += -DUSE_ION
-#ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
-ENV += -I$(SDKTARGETSYSROOT)/usr/include/imx
+ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
 
 ifeq ($(CFG_SECURE_DATA_PATH), y)
 ENV += -DCFG_SECURE_DATA_PATH
diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
index 7d5e33b..c0e5727 100755
--- a/decoder_sw/software/linux/dwl/dwl_linux.c
+++ b/decoder_sw/software/linux/dwl/dwl_linux.c
@@ -50,7 +50,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
 #include <linux/dma-heap.h>
 #else
-#include <linux/ion.h>
+#include <ion.h>
 #endif
 #ifdef ANDROID
 #include <linux/mxc_ion.h>
diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
index 312e4cc..70630c3 100755
--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
@@ -52,7 +52,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
 #include <linux/dma-heap.h>
 #else
-#include <linux/ion.h>
+#include <ion.h>
 #endif
 #include <linux/dma-buf.h>
 #include <linux/version.h>
-- 
2.31.1