From a277191d6e7d775b1c081f8b25734f6f962ade14 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 4 Oct 2018 10:34:00 -0500 Subject: [PATCH] Get i.MX custom headers from /usr/include/imx Upstream-Status: Pending Signed-off-by: Tom Hochstein --- Makefile_G1G2 | 5 ++--- Makefile_H1 | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile_G1G2 b/Makefile_G1G2 index caab40f..5b55a8b 100755 --- a/Makefile_G1G2 +++ b/Makefile_G1G2 @@ -6,12 +6,11 @@ SOURCE_ROOT = decoder_sw/software OMX_ROOT = openmax_il INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/source/hevc \ - -I$(SOURCE_ROOT)/source/config -I$(SOURCE_ROOT)/source/dwl -I$(SOURCE_ROOT)/source/common -I$(SOURCE_ROOT)/source/vp9 \ - -I$(SDKTARGETSYSROOT)/usr/imx/include + -I$(SOURCE_ROOT)/source/config -I$(SOURCE_ROOT)/source/dwl -I$(SOURCE_ROOT)/source/common -I$(SOURCE_ROOT)/source/vp9 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 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 9ca1aa9..237f53a 100755 --- a/Makefile_H1 +++ b/Makefile_H1 @@ -17,8 +17,7 @@ ENV += -DMEMALLOC_MODULE_PATH=\\\"/dev/ion\\\" #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/imx/include +ENV += -I$(SDKTARGETSYSROOT)/usr/include/imx LIBENCNAME = libcodec_enc LIBSENC = -L./ -lhantro_h1 -lpthread -- 2.7.4