copy fwht-ctrls.h from the kernel dir when running 'sync' and add typedef for u64 in codec-fwht.h Signed-off-by: Dafna Hirschfeld <dafna3@xxxxxxxxx> --- Makefile.am | 1 + utils/common/codec-fwht.patch | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index b0b8a098..8abe4f94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,7 @@ sync-with-kernel: cp -a $(KERNEL_DIR)/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c $(top_srcdir)/utils/common cp -a $(KERNEL_DIR)/drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c $(top_srcdir)/utils/common cp -a $(KERNEL_DIR)/include/media/tpg/v4l2-tpg* $(top_srcdir)/utils/common + cp -a $(KERNEL_DIR)/include/media/fwht-ctrls.h $(top_srcdir)/utils/common patch -d $(top_srcdir) --no-backup-if-mismatch -p0 <$(top_srcdir)/utils/common/v4l2-tpg.patch cp -a $(KERNEL_DIR)/drivers/media/platform/vicodec/codec-fwht.[ch] $(top_srcdir)/utils/common/ cp -a $(KERNEL_DIR)/drivers/media/platform/vicodec/codec-v4l2-fwht.[ch] $(top_srcdir)/utils/common/ diff --git a/utils/common/codec-fwht.patch b/utils/common/codec-fwht.patch index 37ac4672..ad27b37a 100644 --- a/utils/common/codec-fwht.patch +++ b/utils/common/codec-fwht.patch @@ -1,6 +1,6 @@ ---- a/utils/common/codec-fwht.h.old 2018-12-29 11:23:58.128328613 -0800 -+++ b/utils/common/codec-fwht.h 2018-12-29 11:24:16.099127560 -0800 -@@ -8,8 +8,26 @@ +--- a/utils/common/codec-fwht.h.old 2019-02-23 09:38:59.454065366 -0800 ++++ b/utils/common/codec-fwht.h 2019-02-23 09:40:44.007803414 -0800 +@@ -8,8 +8,27 @@ #define CODEC_FWHT_H #include <linux/types.h> @@ -21,6 +21,7 @@ +#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1) + + ++typedef __u64 u64; +typedef __u32 u32; +typedef __u16 u16; +typedef __s16 s16; -- 2.17.1
