1 From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001
2 From: Gary Bisson <gary.bisson@boundarydevices.com>
3 Date: Thu, 12 Jul 2018 11:38:28 +0200
4 Subject: [PATCH] Fix ion.h header inclusion to be standard
6 NXP "solution" was to manually copy the header to include/linux.
7 Let's point the Makefile to the proper (mainline) location instead:
8 https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
10 Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
13 decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
14 2 files changed, 3 insertions(+), 1 deletion(-)
16 diff --git a/Makefile b/Makefile
17 index b74e23a..a5ce22b 100755
20 @@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
21 INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
22 #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
23 INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
24 +# ION header location
25 +INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
27 CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
28 -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \
29 diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
30 index 8183660..ed37d86 100644
31 --- a/decoder_sw/software/linux/dwl/dwl_linux.c
32 +++ b/decoder_sw/software/linux/dwl/dwl_linux.c
35 #include <linux/hantrodec.h>
37 -#include <linux/ion.h>
40 #include <linux/mxc_ion.h>
