0003-Fix-Linux-kernel-version-header.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 73cd57c18066ff863335a8616d0b348541d26118 Mon Sep 17 00:00:00 2001
  2. From: Gary Bisson <gary.bisson@boundarydevices.com>
  3. Date: Tue, 15 Nov 2022 21:43:47 +0100
  4. Subject: [PATCH] Fix Linux kernel version header
  5. - Up to kernel 5.10, NXP was using ION for memory management
  6. - Starting with 5.15 kernels, NXP uses DMABUF and the ION header is no
  7. longer in the kernel
  8. - So keep the previous patch for people using kernel <= 5.10
  9. - Add path to the version.h header as imx-vpu-hantro will only include
  10. ion.h depending on the kernel version
  11. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
  12. ---
  13. Makefile_G1G2 | 1 +
  14. Makefile_H1 | 1 +
  15. 2 files changed, 2 insertions(+)
  16. diff --git a/Makefile_G1G2 b/Makefile_G1G2
  17. index 25884fa..8e03e91 100755
  18. --- a/Makefile_G1G2
  19. +++ b/Makefile_G1G2
  20. @@ -11,6 +11,7 @@ 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. +INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi
  25. INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
  26. CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
  27. diff --git a/Makefile_H1 b/Makefile_H1
  28. index 479940a..7ac6f8d 100755
  29. --- a/Makefile_H1
  30. +++ b/Makefile_H1
  31. @@ -18,6 +18,7 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\"
  32. ENV += -DEWL_NO_HW_TIMEOUT
  33. ENV += -DUSE_ION
  34. ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
  35. +ENV += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi
  36. ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
  37. ifeq ($(CFG_SECURE_DATA_PATH), y)
  38. --
  39. 2.35.1