From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Thu, 12 Jul 2018 11:38:28 +0200 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 --- Makefile | 2 ++ decoder_sw/software/linux/dwl/dwl_linux.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) Index: imx-vpu-hantro-1.7.0/decoder_sw/software/linux/dwl/dwl_linux.c =================================================================== --- imx-vpu-hantro-1.7.0.orig/decoder_sw/software/linux/dwl/dwl_linux.c +++ imx-vpu-hantro-1.7.0/decoder_sw/software/linux/dwl/dwl_linux.c @@ -41,7 +41,7 @@ #include "dwl.h" #include #ifdef USE_ION -#include +#include #ifdef ANDROID #include #endif Index: imx-vpu-hantro-1.7.0/Makefile_G1G2 =================================================================== --- imx-vpu-hantro-1.7.0.orig/Makefile_G1G2 +++ imx-vpu-hantro-1.7.0/Makefile_G1G2 @@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOU 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 +# ION header location +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 \