1*4882a593SmuzhiyunFrom dfe8ef9123936d2c1d5da34f63f661849171d5ef Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Gary Bisson <gary.bisson@boundarydevices.com> 3*4882a593SmuzhiyunDate: Sun, 3 Oct 2021 16:39:29 -0700 4*4882a593SmuzhiyunSubject: [PATCH] Fix ion.h header inclusion to be standard 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunNXP "solution" was to manually copy the header to include/linux. 7*4882a593SmuzhiyunLet's point the Makefile to the proper (mainline) location instead: 8*4882a593Smuzhiyunhttps://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Gary Bisson <gary.bisson@boundarydevices.com> 11*4882a593SmuzhiyunSigned-off-by: Chris Dimich <chris.dimich@boundarydevices.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun Makefile_G1G2 | 4 ++-- 14*4882a593Smuzhiyun Makefile_H1 | 4 ++-- 15*4882a593Smuzhiyun decoder_sw/software/linux/dwl/dwl_linux.c | 2 +- 16*4882a593Smuzhiyun h1_encoder/software/linux_reference/ewl/ewl_x280_common.c | 2 +- 17*4882a593Smuzhiyun 4 files changed, 6 insertions(+), 6 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/Makefile_G1G2 b/Makefile_G1G2 20*4882a593Smuzhiyunindex 8f83391..25884fa 100755 21*4882a593Smuzhiyun--- a/Makefile_G1G2 22*4882a593Smuzhiyun+++ b/Makefile_G1G2 23*4882a593Smuzhiyun@@ -10,8 +10,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc 26*4882a593Smuzhiyun #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver 27*4882a593Smuzhiyun-#INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include 28*4882a593Smuzhiyun-INCLUDE_HEADERS += -I$(SDKTARGETSYSROOT)/usr/include/imx 29*4882a593Smuzhiyun+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include 30*4882a593Smuzhiyun+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \ 33*4882a593Smuzhiyun -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \ 34*4882a593Smuzhiyundiff --git a/Makefile_H1 b/Makefile_H1 35*4882a593Smuzhiyunindex 0979571..479940a 100755 36*4882a593Smuzhiyun--- a/Makefile_H1 37*4882a593Smuzhiyun+++ b/Makefile_H1 38*4882a593Smuzhiyun@@ -17,8 +17,8 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\" 39*4882a593Smuzhiyun #ENV += -DSDRAM_LM_BASE=0x00000000 40*4882a593Smuzhiyun ENV += -DEWL_NO_HW_TIMEOUT 41*4882a593Smuzhiyun ENV += -DUSE_ION 42*4882a593Smuzhiyun-#ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include 43*4882a593Smuzhiyun-ENV += -I$(SDKTARGETSYSROOT)/usr/include/imx 44*4882a593Smuzhiyun+ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include 45*4882a593Smuzhiyun+ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun ifeq ($(CFG_SECURE_DATA_PATH), y) 48*4882a593Smuzhiyun ENV += -DCFG_SECURE_DATA_PATH 49*4882a593Smuzhiyundiff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c 50*4882a593Smuzhiyunindex 7d5e33b..c0e5727 100755 51*4882a593Smuzhiyun--- a/decoder_sw/software/linux/dwl/dwl_linux.c 52*4882a593Smuzhiyun+++ b/decoder_sw/software/linux/dwl/dwl_linux.c 53*4882a593Smuzhiyun@@ -50,7 +50,7 @@ 54*4882a593Smuzhiyun #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) 55*4882a593Smuzhiyun #include <linux/dma-heap.h> 56*4882a593Smuzhiyun #else 57*4882a593Smuzhiyun-#include <linux/ion.h> 58*4882a593Smuzhiyun+#include <ion.h> 59*4882a593Smuzhiyun #endif 60*4882a593Smuzhiyun #ifdef ANDROID 61*4882a593Smuzhiyun #include <linux/mxc_ion.h> 62*4882a593Smuzhiyundiff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c 63*4882a593Smuzhiyunindex 312e4cc..70630c3 100755 64*4882a593Smuzhiyun--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c 65*4882a593Smuzhiyun+++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c 66*4882a593Smuzhiyun@@ -52,7 +52,7 @@ 67*4882a593Smuzhiyun #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) 68*4882a593Smuzhiyun #include <linux/dma-heap.h> 69*4882a593Smuzhiyun #else 70*4882a593Smuzhiyun-#include <linux/ion.h> 71*4882a593Smuzhiyun+#include <ion.h> 72*4882a593Smuzhiyun #endif 73*4882a593Smuzhiyun #include <linux/dma-buf.h> 74*4882a593Smuzhiyun #include <linux/version.h> 75*4882a593Smuzhiyun-- 76*4882a593Smuzhiyun2.31.1 77*4882a593Smuzhiyun 78