initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
+77
@@ -0,0 +1,77 @@
|
||||
From dfe8ef9123936d2c1d5da34f63f661849171d5ef Mon Sep 17 00:00:00 2001
|
||||
From: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
Date: Sun, 3 Oct 2021 16:39:29 -0700
|
||||
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 <gary.bisson@boundarydevices.com>
|
||||
Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
|
||||
---
|
||||
Makefile_G1G2 | 4 ++--
|
||||
Makefile_H1 | 4 ++--
|
||||
decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
|
||||
h1_encoder/software/linux_reference/ewl/ewl_x280_common.c | 2 +-
|
||||
4 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile_G1G2 b/Makefile_G1G2
|
||||
index 8f83391..25884fa 100755
|
||||
--- a/Makefile_G1G2
|
||||
+++ b/Makefile_G1G2
|
||||
@@ -10,8 +10,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
|
||||
|
||||
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
|
||||
+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
|
||||
+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 \
|
||||
diff --git a/Makefile_H1 b/Makefile_H1
|
||||
index 0979571..479940a 100755
|
||||
--- a/Makefile_H1
|
||||
+++ b/Makefile_H1
|
||||
@@ -17,8 +17,8 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\"
|
||||
#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/include/imx
|
||||
+ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
|
||||
+ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
|
||||
|
||||
ifeq ($(CFG_SECURE_DATA_PATH), y)
|
||||
ENV += -DCFG_SECURE_DATA_PATH
|
||||
diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
|
||||
index 7d5e33b..c0e5727 100755
|
||||
--- a/decoder_sw/software/linux/dwl/dwl_linux.c
|
||||
+++ b/decoder_sw/software/linux/dwl/dwl_linux.c
|
||||
@@ -50,7 +50,7 @@
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
|
||||
#include <linux/dma-heap.h>
|
||||
#else
|
||||
-#include <linux/ion.h>
|
||||
+#include <ion.h>
|
||||
#endif
|
||||
#ifdef ANDROID
|
||||
#include <linux/mxc_ion.h>
|
||||
diff --git a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
|
||||
index 312e4cc..70630c3 100755
|
||||
--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
|
||||
+++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
|
||||
@@ -52,7 +52,7 @@
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
|
||||
#include <linux/dma-heap.h>
|
||||
#else
|
||||
-#include <linux/ion.h>
|
||||
+#include <ion.h>
|
||||
#endif
|
||||
#include <linux/dma-buf.h>
|
||||
#include <linux/version.h>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
From 4f51b0a6b9a36cc56fa06eb0f76596d8e387f980 Mon Sep 17 00:00:00 2001
|
||||
From: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
Date: Fri, 27 Mar 2020 23:17:30 +0100
|
||||
Subject: [PATCH] Fix build with uclibc toolchain
|
||||
|
||||
From: Laurent Gauthier (OSS) <laurent.gauthier_1@oss.nxp.com>
|
||||
|
||||
By default, backtrace support is disabled in uclibc. In that case the
|
||||
execinfo.h header file is missing, producing a build error.
|
||||
|
||||
Signed-off-by: Laurent Gauthier (OSS) <laurent.gauthier_1@oss.nxp.com>
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
openmax_il/source/dbgmacros.h | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/openmax_il/source/dbgmacros.h b/openmax_il/source/dbgmacros.h
|
||||
index 3771c91..37ae09f 100755
|
||||
--- a/openmax_il/source/dbgmacros.h
|
||||
+++ b/openmax_il/source/dbgmacros.h
|
||||
@@ -50,13 +50,6 @@
|
||||
# define __USE_GNU
|
||||
#endif
|
||||
|
||||
-#ifndef ANDROID
|
||||
-#include <execinfo.h>
|
||||
-#include <link.h>
|
||||
-#endif
|
||||
-#include <dlfcn.h>
|
||||
-#include <elf.h>
|
||||
-
|
||||
/*****************
|
||||
** DEBUG FLAGS **
|
||||
*****************/
|
||||
@@ -76,6 +69,13 @@
|
||||
#define TRACE_FILE "trace.log"
|
||||
#endif
|
||||
|
||||
+#ifndef ANDROID
|
||||
+#include <execinfo.h>
|
||||
+#include <link.h>
|
||||
+#endif
|
||||
+#include <dlfcn.h>
|
||||
+#include <elf.h>
|
||||
+
|
||||
#ifdef LOG_IN_FILE
|
||||
#define TRACE(...) \
|
||||
{ \
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
comment "imx-vpu-hantro needs an i.MX-specific Linux kernel to be built"
|
||||
depends on !BR2_LINUX_KERNEL
|
||||
|
||||
comment "imx-vpu-hantro needs an i.MX platform with Hantro VPU"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
|
||||
|
||||
config BR2_PACKAGE_IMX_VPU_HANTRO
|
||||
bool "imx-vpu-hantro"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
|
||||
help
|
||||
Library of userspace helpers specific for the NXP i.MX SoC
|
||||
integrating a Hantro Video Processing Unit (VPU) such as the
|
||||
i.MX8MQ/i.MX8MM.
|
||||
It requires a kernel that includes the i.MX specific headers
|
||||
to be built.
|
||||
|
||||
This library is provided by NXP as-is and doesn't have an
|
||||
upstream.
|
||||
@@ -0,0 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00 imx-vpu-hantro-1.22.0.bin
|
||||
sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING
|
||||
sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA
|
||||
@@ -0,0 +1,43 @@
|
||||
################################################################################
|
||||
#
|
||||
# imx-vpu-hantro
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IMX_VPU_HANTRO_VERSION = 1.22.0
|
||||
IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE)
|
||||
IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin
|
||||
IMX_VPU_HANTRO_DEPENDENCIES = linux
|
||||
IMX_VPU_HANTRO_INSTALL_STAGING = YES
|
||||
|
||||
IMX_VPU_HANTRO_MAKE_ENV = \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
SDKTARGETSYSROOT=$(STAGING_DIR) \
|
||||
LINUX_KERNEL_ROOT=$(LINUX_DIR) \
|
||||
PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM)
|
||||
|
||||
IMX_VPU_HANTRO_LICENSE = NXP Semiconductor Software License Agreement
|
||||
IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING
|
||||
IMX_VPU_HANTRO_REDISTRIBUTE = NO
|
||||
|
||||
define IMX_VPU_HANTRO_EXTRACT_CMDS
|
||||
$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE))
|
||||
endef
|
||||
|
||||
define IMX_VPU_HANTRO_BUILD_CMDS
|
||||
$(IMX_VPU_HANTRO_MAKE_ENV) $(MAKE1) -C $(@D)
|
||||
endef
|
||||
|
||||
define IMX_VPU_HANTRO_INSTALL_STAGING_CMDS
|
||||
$(IMX_VPU_HANTRO_MAKE_ENV) $(MAKE1) -C $(@D) \
|
||||
DEST_DIR=$(STAGING_DIR) libdir=/usr/lib install
|
||||
endef
|
||||
|
||||
define IMX_VPU_HANTRO_INSTALL_TARGET_CMDS
|
||||
$(IMX_VPU_HANTRO_MAKE_ENV) $(MAKE1) -C $(@D) \
|
||||
DEST_DIR=$(TARGET_DIR) libdir=/usr/lib install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user