All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/2] imx: fix i.MX8MMini support
@ 2020-03-26 16:49 Gary Bisson
  2020-03-26 16:49 ` [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration Gary Bisson
  2020-03-26 16:49 ` [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0 Gary Bisson
  0 siblings, 2 replies; 8+ messages in thread
From: Gary Bisson @ 2020-03-26 16:49 UTC (permalink / raw)
  To: buildroot

Hi,

This series fixes some issues with i.MX8MMini:
- This platform uses Hantro VPU just like i.MX8MQ
- It was lacking a platform variable so that VPU package knows when to
  build encoder (or not).
- Updating imx-vpu-hantro to support i.MX8Mini and its encoder

Let me know if you have any questions.

Regards,
Gary

Gary Bisson (2):
  package/freescale-imx: fix i.MX8MMini configuration
  package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0

 package/freescale-imx/Config.in               |  6 +-
 ...on.h-header-inclusion-to-be-standard.patch | 64 ++++++++++++++-----
 .../imx-vpu-hantro/imx-vpu-hantro.hash        |  6 +-
 .../imx-vpu-hantro/imx-vpu-hantro.mk          |  5 +-
 4 files changed, 58 insertions(+), 23 deletions(-)

-- 
2.25.1

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration
  2020-03-26 16:49 [Buildroot] [PATCH 0/2] imx: fix i.MX8MMini support Gary Bisson
@ 2020-03-26 16:49 ` Gary Bisson
  2020-03-30  6:25   ` Thomas Petazzoni
  2020-03-26 16:49 ` [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0 Gary Bisson
  1 sibling, 1 reply; 8+ messages in thread
From: Gary Bisson @ 2020-03-26 16:49 UTC (permalink / raw)
  To: buildroot

- Just like i.MX8MQ, i.MX8MMini is using Hantro VPU.
- Platform name wasn't set for i.MX8Mini
  -> now differencing IMX8MQ and IMX8MM for VPU package

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 package/freescale-imx/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index f42bb11a3c..0a5be9c75a 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -66,7 +66,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
 	default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
 	default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
 	default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
-	default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+	default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+	default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
 
 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
 	bool
@@ -77,7 +78,8 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
 
 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
 	bool
-	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
+	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M || \
+		BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
 
 config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
 	bool
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0
  2020-03-26 16:49 [Buildroot] [PATCH 0/2] imx: fix i.MX8MMini support Gary Bisson
  2020-03-26 16:49 ` [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration Gary Bisson
@ 2020-03-26 16:49 ` Gary Bisson
  2020-03-27 10:31   ` Laurent Gauthier
  2020-03-30  6:25   ` Thomas Petazzoni
  1 sibling, 2 replies; 8+ messages in thread
From: Gary Bisson @ 2020-03-26 16:49 UTC (permalink / raw)
  To: buildroot

To match NXP BSP 4.19.35-1.1.0 release:
https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-bsp/imx-vpu-hantro?h=warrior-4.19.35-1.1.0

Adds support for i.MX8MMini platform (Hantro H1 encoder).

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 ...on.h-header-inclusion-to-be-standard.patch | 64 ++++++++++++++-----
 .../imx-vpu-hantro/imx-vpu-hantro.hash        |  6 +-
 .../imx-vpu-hantro/imx-vpu-hantro.mk          |  5 +-
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
index 951ead9824..f5a67cd514 100644
--- a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
+++ b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
@@ -1,6 +1,6 @@
-From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001
+From e776e7360f80da9ac03f81a5df27d8b7fabc7ac7 Mon Sep 17 00:00:00 2001
 From: Gary Bisson <gary.bisson@boundarydevices.com>
-Date: Thu, 12 Jul 2018 11:38:28 +0200
+Date: Thu, 26 Mar 2020 16:00:33 +0100
 Subject: [PATCH] Fix ion.h header inclusion to be standard
 
 NXP "solution" was to manually copy the header to include/linux.
@@ -9,25 +9,44 @@ https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h
 
 Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
 ---
- Makefile                                  | 2 ++
- decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ 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 b/Makefile
-index b74e23a..a5ce22b 100755
---- a/Makefile
-+++ b/Makefile
-@@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
+diff --git a/Makefile_G1G2 b/Makefile_G1G2
+index 8280cce..4c9fc34 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
-+# ION header location
+-#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 9ab62e1..8d366e3 100755
+--- a/Makefile_H1
++++ b/Makefile_H1
+@@ -17,8 +17,8 @@ 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/include/imx
++ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
++ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
+ 
+ LIBENCNAME = libcodec_enc
+ LIBSENC = -L./ -lhantro_h1 -lpthread
 diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
-index 8183660..ed37d86 100644
+index 9b057f0..43225f6 100755
 --- a/decoder_sw/software/linux/dwl/dwl_linux.c
 +++ b/decoder_sw/software/linux/dwl/dwl_linux.c
 @@ -41,7 +41,7 @@
@@ -36,9 +55,22 @@ index 8183660..ed37d86 100644
  #ifdef USE_ION
 -#include <linux/ion.h>
 +#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
+ #ifdef ANDROID
+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 fef1307..20b6f95 100755
+--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
++++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+@@ -49,7 +49,7 @@
+ 
+ #include "linux/hx280enc.h"
+ #ifdef USE_ION
+-#include <linux/ion.h>
++#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
  #ifdef ANDROID
- #include <linux/mxc_ion.h>
- #endif
 -- 
-2.18.0
+2.25.1
 
diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
index 4fa48fb806..7f02f92467 100644
--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
@@ -1,3 +1,3 @@
-sha256  cbc648e41f005aad209f74c9e5dd346138dca12efeb7b27e471de7474c4da302  imx-vpu-hantro-1.6.0.bin
-sha256  0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a  COPYING
-sha256  faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a  EULA
+sha256  8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5  imx-vpu-hantro-1.15.0.bin
+sha256  d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561  COPYING
+sha256  9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7  EULA
diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
index a82899e64b..dbdbd4dc7b 100644
--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMX_VPU_HANTRO_VERSION = 1.6.0
+IMX_VPU_HANTRO_VERSION = 1.15.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
@@ -15,7 +15,8 @@ IMX_VPU_HANTRO_MAKE_ENV = \
 	$(TARGET_CONFIGURE_OPTS) \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	SDKTARGETSYSROOT=$(STAGING_DIR) \
-	LINUX_KERNEL_ROOT=$(LINUX_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
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0
  2020-03-26 16:49 ` [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0 Gary Bisson
@ 2020-03-27 10:31   ` Laurent Gauthier
  2020-03-27 14:27     ` Gary Bisson
  2020-03-30  6:25   ` Thomas Petazzoni
  1 sibling, 1 reply; 8+ messages in thread
From: Laurent Gauthier @ 2020-03-27 10:31 UTC (permalink / raw)
  To: buildroot

Hi Gary,

While testing your change I ran into a build problem due to the fact that execinfo.h is included in some debug macro header.

This failure occurred because I build with a uclibc in default configuration and by default backtrace support is not enabled (and therefore this header file is not available).

After looking at the details I came up with the following patch that can be applied to properly avoid the build issue.

package/freescale-imx/imx-vpu-hantro/0002-disable-debug-macros.patch
---- 8< -----------------
--- a/openmax_il/source/dbgmacros.h     2019-09-30 05:21:45.000000000 +0200
+++ b/openmax_il/source/dbgmacros.h     2020-03-27 10:34:07.354415087 +0100
@@ -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(...)                                              \
     {                                                           \
---- 8< -----------------

I hope this helps.

Kind Regards, Laurent.

________________________________________
From: buildroot <buildroot-bounces@busybox.net> on behalf of Gary Bisson <gary.bisson@boundarydevices.com>
Sent: Thursday, March 26, 2020 4:49 PM
To: buildroot at buildroot.org
Cc: Gary Bisson; Refik Tuzakli
Subject: [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0

To match NXP BSP 4.19.35-1.1.0 release:
https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-bsp/imx-vpu-hantro?h=warrior-4.19.35-1.1.0

Adds support for i.MX8MMini platform (Hantro H1 encoder).

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 ...on.h-header-inclusion-to-be-standard.patch | 64 ++++++++++++++-----
 .../imx-vpu-hantro/imx-vpu-hantro.hash        |  6 +-
 .../imx-vpu-hantro/imx-vpu-hantro.mk          |  5 +-
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
index 951ead9824..f5a67cd514 100644
--- a/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
+++ b/package/freescale-imx/imx-vpu-hantro/0001-Fix-ion.h-header-inclusion-to-be-standard.patch
@@ -1,6 +1,6 @@
-From 872c82e7cbb9a0a0e761e8ac70fc28e19a55b4c3 Mon Sep 17 00:00:00 2001
+From e776e7360f80da9ac03f81a5df27d8b7fabc7ac7 Mon Sep 17 00:00:00 2001
 From: Gary Bisson <gary.bisson@boundarydevices.com>
-Date: Thu, 12 Jul 2018 11:38:28 +0200
+Date: Thu, 26 Mar 2020 16:00:33 +0100
 Subject: [PATCH] Fix ion.h header inclusion to be standard

 NXP "solution" was to manually copy the header to include/linux.
@@ -9,25 +9,44 @@ https://elixir.bootlin.com/linux/v4.17/source/drivers/staging/android/uapi/ion.h

 Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
 ---
- Makefile                                  | 2 ++
- decoder_sw/software/linux/dwl/dwl_linux.c | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ 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 b/Makefile
-index b74e23a..a5ce22b 100755
---- a/Makefile
-+++ b/Makefile
-@@ -11,6 +11,8 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
+diff --git a/Makefile_G1G2 b/Makefile_G1G2
+index 8280cce..4c9fc34 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
-+# ION header location
+-#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 9ab62e1..8d366e3 100755
+--- a/Makefile_H1
++++ b/Makefile_H1
+@@ -17,8 +17,8 @@ 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/include/imx
++ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
++ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
+
+ LIBENCNAME = libcodec_enc
+ LIBSENC = -L./ -lhantro_h1 -lpthread
 diff --git a/decoder_sw/software/linux/dwl/dwl_linux.c b/decoder_sw/software/linux/dwl/dwl_linux.c
-index 8183660..ed37d86 100644
+index 9b057f0..43225f6 100755
 --- a/decoder_sw/software/linux/dwl/dwl_linux.c
 +++ b/decoder_sw/software/linux/dwl/dwl_linux.c
 @@ -41,7 +41,7 @@
@@ -36,9 +55,22 @@ index 8183660..ed37d86 100644
  #ifdef USE_ION
 -#include <linux/ion.h>
 +#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
+ #ifdef ANDROID
+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 fef1307..20b6f95 100755
+--- a/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
++++ b/h1_encoder/software/linux_reference/ewl/ewl_x280_common.c
+@@ -49,7 +49,7 @@
+
+ #include "linux/hx280enc.h"
+ #ifdef USE_ION
+-#include <linux/ion.h>
++#include <ion.h>
+ #include <linux/dma-buf.h>
+ #include <linux/version.h>
  #ifdef ANDROID
- #include <linux/mxc_ion.h>
- #endif
 --
-2.18.0
+2.25.1

diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
index 4fa48fb806..7f02f92467 100644
--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
@@ -1,3 +1,3 @@
-sha256  cbc648e41f005aad209f74c9e5dd346138dca12efeb7b27e471de7474c4da302  imx-vpu-hantro-1.6.0.bin
-sha256  0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a  COPYING
-sha256  faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a  EULA
+sha256  8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5  imx-vpu-hantro-1.15.0.bin
+sha256  d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561  COPYING
+sha256  9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7  EULA
diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
index a82899e64b..dbdbd4dc7b 100644
--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-IMX_VPU_HANTRO_VERSION = 1.6.0
+IMX_VPU_HANTRO_VERSION = 1.15.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
@@ -15,7 +15,8 @@ IMX_VPU_HANTRO_MAKE_ENV = \
        $(TARGET_CONFIGURE_OPTS) \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        SDKTARGETSYSROOT=$(STAGING_DIR) \
-       LINUX_KERNEL_ROOT=$(LINUX_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
--
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0
  2020-03-27 10:31   ` Laurent Gauthier
@ 2020-03-27 14:27     ` Gary Bisson
  0 siblings, 0 replies; 8+ messages in thread
From: Gary Bisson @ 2020-03-27 14:27 UTC (permalink / raw)
  To: buildroot

Hi Laurent,

On Fri, Mar 27, 2020 at 10:31:03AM +0000, Laurent Gauthier (OSS) wrote:
> Hi Gary,
> 
> While testing your change I ran into a build problem due to the fact that execinfo.h is included in some debug macro header.
> 
> This failure occurred because I build with a uclibc in default configuration and by default backtrace support is not enabled (and therefore this header file is not available).

Indeed I only built with glibc toolchain (prebuilt one).

> After looking at the details I came up with the following patch that can be applied to properly avoid the build issue.
> 
> package/freescale-imx/imx-vpu-hantro/0002-disable-debug-macros.patch
> ---- 8< -----------------
> --- a/openmax_il/source/dbgmacros.h     2019-09-30 05:21:45.000000000 +0200
> +++ b/openmax_il/source/dbgmacros.h     2020-03-27 10:34:07.354415087 +0100
> @@ -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(...)                                              \
>      {                                                           \
> ---- 8< -----------------
> 
> I hope this helps.

It does help a lot, thanks! I'll add your patch in my v2 then.

Have you reached out to the NXP team internally to have the patch merged
for next release by any chance?

Thanks,
Gary

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration
  2020-03-26 16:49 ` [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration Gary Bisson
@ 2020-03-30  6:25   ` Thomas Petazzoni
  2020-03-30  7:49     ` Gary Bisson
  0 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2020-03-30  6:25 UTC (permalink / raw)
  To: buildroot

Hello Gary,

On Thu, 26 Mar 2020 17:49:42 +0100
Gary Bisson <gary.bisson@boundarydevices.com> wrote:

> - Just like i.MX8MQ, i.MX8MMini is using Hantro VPU.
> - Platform name wasn't set for i.MX8Mini
>   -> now differencing IMX8MQ and IMX8MM for VPU package  
> 
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

So, I've applied, but I have one comment/concern below.

> diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
> index f42bb11a3c..0a5be9c75a 100644
> --- a/package/freescale-imx/Config.in
> +++ b/package/freescale-imx/Config.in
> @@ -66,7 +66,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
>  	default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
>  	default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
>  	default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
> -	default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
> +	default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
> +	default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM

I am not sure about the usefulness of this
BR2_PACKAGE_FREESCALE_IMX_PLATFORM string, especially for i.MX8
platforms. Indeed, this string is only used by the imx-lib and imx-vpu
packages, and it seems that they are not relevant for i.MX8. So what is
the "reference" to know what is the correct string for i.MX8 platforms
? Does it really make sense to have this option in
package/freescale-imx/Config.in ? Should we have it instead in imx-lib
and imx-vpu instead ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0
  2020-03-26 16:49 ` [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0 Gary Bisson
  2020-03-27 10:31   ` Laurent Gauthier
@ 2020-03-30  6:25   ` Thomas Petazzoni
  1 sibling, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2020-03-30  6:25 UTC (permalink / raw)
  To: buildroot

On Thu, 26 Mar 2020 17:49:43 +0100
Gary Bisson <gary.bisson@boundarydevices.com> wrote:

> To match NXP BSP 4.19.35-1.1.0 release:
> https://source.codeaurora.org/external/imx/meta-fsl-bsp-release/tree/imx/meta-bsp/recipes-bsp/imx-vpu-hantro?h=warrior-4.19.35-1.1.0
> 
> Adds support for i.MX8MMini platform (Hantro H1 encoder).
> 
> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> ---
>  ...on.h-header-inclusion-to-be-standard.patch | 64 ++++++++++++++-----
>  .../imx-vpu-hantro/imx-vpu-hantro.hash        |  6 +-
>  .../imx-vpu-hantro/imx-vpu-hantro.mk          |  5 +-
>  3 files changed, 54 insertions(+), 21 deletions(-)

Following the feedback from Laurent, I've marked this patch as Changes
Requested.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration
  2020-03-30  6:25   ` Thomas Petazzoni
@ 2020-03-30  7:49     ` Gary Bisson
  0 siblings, 0 replies; 8+ messages in thread
From: Gary Bisson @ 2020-03-30  7:49 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

On Mon, Mar 30, 2020 at 08:25:24AM +0200, Thomas Petazzoni wrote:
> Hello Gary,
> 
> On Thu, 26 Mar 2020 17:49:42 +0100
> Gary Bisson <gary.bisson@boundarydevices.com> wrote:
> 
> > - Just like i.MX8MQ, i.MX8MMini is using Hantro VPU.
> > - Platform name wasn't set for i.MX8Mini
> >   -> now differencing IMX8MQ and IMX8MM for VPU package  
> > 
> > Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> 
> So, I've applied, but I have one comment/concern below.
> 
> > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
> > index f42bb11a3c..0a5be9c75a 100644
> > --- a/package/freescale-imx/Config.in
> > +++ b/package/freescale-imx/Config.in
> > @@ -66,7 +66,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
> >  	default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
> >  	default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
> >  	default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8
> > -	default "IMX8" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
> > +	default "IMX8MQ" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M
> > +	default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM
> 
> I am not sure about the usefulness of this
> BR2_PACKAGE_FREESCALE_IMX_PLATFORM string, especially for i.MX8
> platforms. Indeed, this string is only used by the imx-lib and imx-vpu
> packages, and it seems that they are not relevant for i.MX8. So what is
> the "reference" to know what is the correct string for i.MX8 platforms
> ? Does it really make sense to have this option in
> package/freescale-imx/Config.in ? Should we have it instead in imx-lib
> and imx-vpu instead ?

Well regarding i.MX8, it will be used in imx-vpu-hantro once updated [1].
But it is true it might the only place where it will be useful for
i.MX8.
For i.MX6, since it used in both imx-lib and imx-vpu, it felt right not
to duplicate this logic. So I guess i.MX8 platform naming went here for
consistency.
Also, since all the i.MX variants are declared in
freescale-imx/Config.in, feels ok to me to have the logic at the same
spot. But I'm open to moving it to different packages.

Regards,
Gary

[1] http://patchwork.ozlabs.org/patch/1262157/

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-03-30  7:49 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-26 16:49 [Buildroot] [PATCH 0/2] imx: fix i.MX8MMini support Gary Bisson
2020-03-26 16:49 ` [Buildroot] [PATCH 1/2] package/freescale-imx: fix i.MX8MMini configuration Gary Bisson
2020-03-30  6:25   ` Thomas Petazzoni
2020-03-30  7:49     ` Gary Bisson
2020-03-26 16:49 ` [Buildroot] [PATCH 2/2] package/freescale-imx/imx-vpu-hantro: bump version to 1.15.0 Gary Bisson
2020-03-27 10:31   ` Laurent Gauthier
2020-03-27 14:27     ` Gary Bisson
2020-03-30  6:25   ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.