Skip to contentSkip to conversation

Update Freescale packages to 3.10.53-1.1.0_GA

PATCH Superseded Gary Bisson 3 participants 21 messages May 20, 2015 – Jul 11, 2015 Arm i.MX and Layerscape

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Gary Bisson

author
#0 lore raw

cover Update Freescale packages to 3.10.53-1.1.0_GA

Hi all,

This serie aims at updating all the Freescale pacakges to version 3.10.53-1.1.0_GA. This is based on the updates made in the meta-fsl-am layer on Jan 27, 2015.
https://github.com/Freescale/meta-fsl-arm/commits/master

All the patches are pretty straight forward apart from the graphics package update which I based on Antoine Tenart patch. I will detail the changes and the testing on every patch.

In order to test as much features as I could at once, here is my
configuration (using Nitrogen6x):
BR2_arm=y
BR2_cortex_a9=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_OPTIMIZATION="-pipe"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/nitrogen6x/post-build.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/tarball/98c0fdbe/linux-imx6-98c0fdbe.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6q-nitrogen6_max imx6q-sabrelite" BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_GSTREAMER=y
BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
BR2_PACKAGE_GST_PLUGINS_GOOD=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA=y
BR2_PACKAGE_GST_FSL_PLUGINS=y
BR2_PACKAGE_GSTREAMER1=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
BR2_PACKAGE_GST1_PLUGINS_GOOD=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
BR2_PACKAGE_GST1_IMX=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_EXAMPLES=y
BR2_PACKAGE_QT5BASE_OPENGL_ES2=y
BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
BR2_PACKAGE_QT5BASE_XCB=y
BR2_PACKAGE_QT5BASE_DEFAULT_QPA="xcb"
BR2_PACKAGE_QT5BASE_GIF=y
BR2_PACKAGE_QT5BASE_JPEG=y
BR2_PACKAGE_QT5BASE_PNG=y
BR2_PACKAGE_QT5QUICKCONTROLS=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV=y
BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV=y
BR2_PACKAGE_XTERM=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_CFFI=y
BR2_PACKAGE_PYTHON_SETUPTOOLS=y
BR2_PACKAGE_LIBSHA1=y
BR2_PACKAGE_TIFF=y
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_RSYNC=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/21eb4146/u-boot-21eb4146.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_PACKAGE_HOST_E2FSPROGS=y
BR2_PACKAGE_HOST_GENEXT2FS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y

Regards,
Gary

Antoine Tenart (1):
gpu-viv-bin-mx6q: bump to 5.0.11.p4.1

Gary Bisson (12):
libfslvpuwrap: bump version to 1.0.57
libfslcodec: bump version to 4.0.2
libfslparser: bump version to 4.0.2
gst-fsl-plugins: bump version to 4.0.2
imx-vpu: bump version to 5.4.27
freescale-imx: bump to 3.10.53-1.1.0 GA release
gpu-viv-bin-mx6q: rename package to imx-gpu-viv xdriver_xf86-video-imx-viv: bump to version 3.10.53-1.1.0 GA
nitrogen6x_defconfig: bump version to 3.10.53_1.1.1_ga board/boundarydevices: update 6x_bootscript freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA
qmx6_defconfig: bump version to 3.10.53_1.1.0

 board/boundarydevices/nitrogen6x/6x_bootscript     | Bin 3207 -> 4682 bytes
 configs/freescale_imx6dlsabreauto_defconfig        |   6 +-
 configs/freescale_imx6dlsabresd_defconfig          |   7 +-
 configs/freescale_imx6qsabreauto_defconfig         |   6 +-
 configs/freescale_imx6qsabresd_defconfig           |   7 +-
 configs/freescale_imx6sololiteevk_defconfig        |   5 +-
 configs/nitrogen6x_defconfig                       |  10 +--
 configs/qmx6_defconfig                             |   8 +-
 package/freescale-imx/Config.in                    |   2 +-
 package/freescale-imx/freescale-imx.mk             |   2 +-
 .../0001-correct-HAL-include.patch                 |  16 ----
 package/freescale-imx/gpu-viv-bin-mx6q/egl.pc      |  10 ---
 package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc   |  10 ---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk           |  89 -------------------
 package/freescale-imx/gpu-viv-bin-mx6q/vg.pc       |  10 ---
 .../{gpu-viv-bin-mx6q => imx-gpu-viv}/Config.in    |  26 +++---
 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk   |  98 +++++++++++++++++++++
 .../0001-vpu-io-fix-IOSystemInit-failure.patch     |  32 -------
 ...-lib-fix-IOGetVirtMem-return-value-checks.patch |  59 -------------
 package/freescale-imx/imx-vpu/imx-vpu.mk           |   2 +-
 .../0002-Fix-bashism-in-configure-script.patch     |   4 +-
 .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk   |   2 +-
 package/gstreamer1/gst1-imx/Config.in              |   6 +-
 package/gstreamer1/gst1-imx/gst1-imx.mk            |   2 +-
 package/libfslcodec/libfslcodec.mk                 |   2 +-
 package/libfslparser/libfslparser.mk               |   2 +-
 ...-fix-tests-of-return-value-from-IOGetVirt.patch |  44 ---------
 package/libfslvpuwrap/libfslvpuwrap.mk             |   2 +-
 package/qt5/qt5base/qt5base.mk                     |   2 +-
 .../0001-Fix-LoadExtenions.patch                   |  15 ----
 package/x11r7/xdriver_xf86-video-imx-viv/Config.in |   6 +-
 .../xdriver_xf86-video-imx-viv.mk                  |   4 +-
 32 files changed, 152 insertions(+), 344 deletions(-)
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
 rename package/freescale-imx/{gpu-viv-bin-mx6q => imx-gpu-viv}/Config.in (72%)
 create mode 100644 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
 delete mode 100644 package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
 delete mode 100644 package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
 delete mode 100644 package/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
 delete mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/13 libfslvpuwrap: bump version to 1.0.57

New feature for 1.0.57 version:
* Add workaround for rmvb decode timeout issue when no enough frame buffer.
* Re-enable the detection of resolution change due to the latest firmware.

Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/b1edff7ec98fec1c969f6f2736a79d38aee75580

The previous patch applied can now be removed since it has been integrated in ver 1.0.51 (see Changelog).

This package has been implicitely tested through gstreamer as the plugins rely on it for vpu decoding:

# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
  matroskademux ! imxvpudec ! imxipuvideosink

Regards,
Gary

---
 ...-fix-tests-of-return-value-from-IOGetVirt.patch | 44 ----------------------
 package/libfslvpuwrap/libfslvpuwrap.mk             |  2 +-
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 package/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
package/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch deleted +0 -44
deleted file mode 100644
index 3927430..0000000
@@ -1,44 +0,0 @@
-From 7ca66c10c05168c7d342df7c7a70d4a1ae0629f7 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <[email protected]>
-Date: Sat, 28 Jun 2014 09:45:09 -0700
-Subject: [PATCH] vpu_wrapper: fix tests of return value from IOGetVirtMem
-
-IOGetVirtMem() returns a pointer or specifically -1 (MAP_FAILED)
-in the case of failure.
-
-This problem is being discussed upstream at
-https://lists.yoctoproject.org/pipermail/meta-freescale/2014-June/008993.html.
-
-Upstream-Status: Pending
-
-Signed-off-by: Laci Tele <[email protected]>
-Signed-off-by: Eric Nelson <[email protected]>
----
- vpu_wrapper.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/vpu_wrapper.c b/vpu_wrapper.c
-index 9249174..148c5df 100755
---- a/vpu_wrapper.c
-+++ b/vpu_wrapper.c
-@@ -6653,7 +6653,7 @@ VpuDecRetCode VPU_DecGetMem(VpuMemDesc* pInOutMem)
- 		return VPU_DEC_RET_FAILURE;
- 	}
- 	ret=IOGetVirtMem(&buff);
--	if(ret==0) //if(ret!=RETCODE_SUCCESS)
-+	if(ret == -1) //if(ret==MAP_FAILED)
- 	{
- 		VPU_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,ret);
- 		return VPU_DEC_RET_FAILURE;
-@@ -8277,7 +8277,7 @@ VpuEncRetCode VPU_EncGetMem(VpuMemDesc* pInOutMem)
- 		return VPU_ENC_RET_FAILURE;
- 	}
- 	ret=IOGetVirtMem(&buff);
--	if(ret==0) //if(ret!=RETCODE_SUCCESS)
-+	if(ret == -1) //if(ret==MAP_FAILED)
- 	{
- 		VPU_ENC_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,(UINT32)ret);
- 		return VPU_ENC_RET_FAILURE;
--- 
-1.9.1
-
package/libfslvpuwrap/libfslvpuwrap.mk +1 -1
index 01b2999..625f586 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFSLVPUWRAP_VERSION = 1.0.46
+LIBFSLVPUWRAP_VERSION = 1.0.57
 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin
 LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 2/13 libfslcodec: bump version to 4.0.2

In reply to Gary Bisson
Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/1a564bcf14c49356667dd91f90f07891cf2f9064

This package has been implicitely tested through gstreamer as the 0.10 plugin relies on it:

# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm

Regards,
Gary

---
 package/libfslcodec/libfslcodec.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libfslcodec/libfslcodec.mk +1 -1
index fe6f0ba..665588a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFSLCODEC_VERSION = 3.0.11
+LIBFSLCODEC_VERSION = 4.0.2
 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
 LIBFSLCODEC_INSTALL_STAGING = YES
Signature · 1 line
2.1.4
author
#3 lore raw

PATCH 3/13 libfslparser: bump version to 4.0.2

In reply to Gary Bisson

New feature for 4.0.2 version:
* Enhanced Metadata supporting in MP4, MKV, AVI, ASF parser.

Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/550fb2de655f3bdbb057c41b55328b0ce2919bb9

This package has been implicitely tested through gstreamer as the 0.10 plugin relies on it:

# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm

Regards,
Gary

---
 package/libfslparser/libfslparser.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libfslparser/libfslparser.mk +1 -1
index 706a10e..50f0bf6 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFSLPARSER_VERSION = 3.0.11
+LIBFSLPARSER_VERSION = 4.0.2
 LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
 LIBFSLPARSER_INSTALL_STAGING = YES
Signature · 1 line
2.1.4
author
#4 lore raw

PATCH 4/13 gst-fsl-plugins: bump version to 4.0.2

In reply to Gary Bisson
Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/730b7ca5d2f13083f4e44636308a2f55a8d346f2

This package has been tested using the following commands:

# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
#?gst-launch-0.10  filesrc location=/root/tears_of_steel_1080p.webm ! \
  matroskademux ! vpudec ! autovideosink
#?gst-launch-0.10  filesrc location=/root/tears_of_steel_1080p.webm ! \
  matroskademux ! vpudec ! mfw_isink
# gst-launch-0.10 imxv4l2src ! autovideosink

Regards,
Gary

---
 .../gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch        | 4 +---
 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk                  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch +1 -3
index 35617cd..471c483 100644
@@ -25,7 +25,7 @@ index 5968eb6..1a31a06 100755
  fi
  AC_SUBST(VPU_LIBS)
  
-@@ -176,15 +176,15 @@ AC_SUBST(RT_CFLAGS)
+@@ -176,14 +176,14 @@ AC_SUBST(RT_CFLAGS)
  AC_SUBST(RT_LIBS)
  
  FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`

@@ -40,10 +40,8 @@ index 5968eb6..1a31a06 100755
  FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null`
 -FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`
 -FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null`
--FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`
 +FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`"
 +FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
-+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null`"
  AC_SUBST(FSL_MM_CORE_LIBS)
  
  EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +1 -1
index 8d8b8b4..a7dea0f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST_FSL_PLUGINS_VERSION = 3.0.11
+GST_FSL_PLUGINS_VERSION = 4.0.2
 GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
 
 # Most is LGPLv2+, but some sources are copied from upstream and are
Signature · 1 line
2.1.4
author
#5 lore raw

PATCH 5/13 imx-vpu: bump version to 5.4.27

In reply to Gary Bisson

- imx-vpu version changed to internal version
- VPU share memory file open fixes
- Upgrade ion usage
- Remove obey-variables patch -now included in release

Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/db343da3e4eb2afa6a72f7526751bb8d8ba287e1

The IOGetVirtMem return value patch has now been included into the upstream package.

This package has been implicitely tested through gstreamer as the plugins rely on it for vpu decoding:

# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
  matroskademux ! imxvpudec ! imxipuvideosink

Regards,
Gary

---
 .../0001-vpu-io-fix-IOSystemInit-failure.patch     | 32 ------------
 ...-lib-fix-IOGetVirtMem-return-value-checks.patch | 59 ----------------------
 package/freescale-imx/imx-vpu/imx-vpu.mk           |  2 +-
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
 delete mode 100644 package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch deleted +0 -32
deleted file mode 100644
index ed93193..0000000
@@ -1,32 +0,0 @@
-[PATCH] vpu-io: fix IOSystemInit failure
-
-When using a kernel where user/kernel split is 3G/1G, the address
-returned by IOGetVirtMem() can appear to be a negative int.
-
-IOSystemInit() incorrectly checks the return value of IOGetVirtMem().
-IOGetVirtMem() returns -1 on error (and not MAP_FAILED, nor any other
-negative value.)
-
-Fix that by correctly checking against -1 (and not MAP_FAILED!)
-
-Signed-off-by: Gary Bisson <[email protected]>
-[yann.morin.1998 at free.fr: expand the commit log]
-Signed-off-by: "Yann E. MORIN" <[email protected]>
----
- vpu/vpu_io.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c
-index 8cbb571..14759da 100644
---- a/vpu/vpu_io.c
-+++ b/vpu/vpu_io.c
-@@ -265,7 +265,7 @@ int IOSystemInit(void *callback)
- 		goto err;
- 	}
- 
--	if (IOGetVirtMem(&bit_work_addr) <= 0)
-+	if (IOGetVirtMem(&bit_work_addr) == -1)
- 		goto err;
- #endif
- 	UnlockVpu(vpu_semap);
-
package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch deleted +0 -59

59 lines not on this page · raw message

package/freescale-imx/imx-vpu/imx-vpu.mk +1 -1
index ab3634d..4c4a031 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_VPU_VERSION = 5.4.27
 IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
 IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
Signature · 1 line
2.1.4
author
#6 lore raw

PATCH 6/13 freescale-imx: bump to 3.10.53-1.1.0 GA release

In reply to Gary Bisson

This version now only applies to imx-lib and firmware-imx. All other Freescale packages have their own version from now on.

Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/80ad0f2e5447c1fef976ff9a494d39f78b0eb6d1
https://github.com/Freescale/meta-fsl-arm/commit/b12d193092484c02d7ccf2e6d98c4887aa41b408

Those packages have been implicitely tested through gstreamer as the plugins rely on them for vpu decoding for instance:

# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
  matroskademux ! imxvpudec ! imxipuvideosink

Regards,
Gary

---
 package/freescale-imx/freescale-imx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/freescale-imx/freescale-imx.mk +1 -1
index 64f3b6b..26c591b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESCALE_IMX_VERSION = 3.10.17-1.0.0
+FREESCALE_IMX_VERSION = 3.10.53-1.1.0
 FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
 
 # Helper for self-extracting binaries distributed by Freescale.
Signature · 1 line
2.1.4
author
#7 lore raw

PATCH 7/13 gpu-viv-bin-mx6q: bump to 5.0.11.p4.1

In reply to Gary Bisson

From: Antoine Tenart <[email protected]>

Bump the Vivante drivers to 5.0.11.p4.1. The version scheme has changed and 5.0.11.p4.1 is indeed the latest version.

In addition to the version bump, other changes are done to handle the new directory organisation.

The work behind this commit was funded by ECA Group
<http://www.ecagroup.com>. ECA Group is the copyright owner of the contributed code.

Changelog:
- Package version is changed to use Vivante version
- imx-gpu-viv includes separate sub packages for demos and tools to support flexible package additions
- Graphics package is reorganized to improve library layout
- New GPU tool apitrace is added - supported only for X11 backend (not supported yet)
- gpu-viv-g2d shares same package with imx-gpu-viv (not supported yet)

[Gary: use pkgconfig files provided inside the packages, extend commit
log and add a symlink fixup for X11 libs]

Signed-off-by Antoine Tenart <[email protected]>
Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9639f6f20991ab64ea75177a017f8749a

Antoine provided a patch that I modified:
1- used the pkgconfig files provided in the package from now on 2- extend the commit log
3- add a symlink for libGAL_egl.so as it wasn't working on X
- had to do a fixup as for some reason the lib is called libGAL_egl.dri.so

Without that last symlink change, the tutorial examples were missing some symbols and qtbase wouldn't build.

I wasn't sure if the fixup was the most elegant way to deal with it but I'm open to any remark to improve it.

On separate patches, here are some enchancements that could be made to this package:
- add option to install g2d libraries
- add option to install apitrace tools (X11 only)

This package has been tested with both X11 and Framebuffer backends; #?cd /usr/share/examples/viv_samples/vdk/

# ./tutorial7

Regards,
Gary

---
 .../0001-correct-HAL-include.patch                 | 16 --------
 package/freescale-imx/gpu-viv-bin-mx6q/egl.pc      | 10 -----
 package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc   | 10 -----
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk           | 47 +++++++++++++---------
 package/freescale-imx/gpu-viv-bin-mx6q/vg.pc       | 10 -----
 5 files changed, 28 insertions(+), 65 deletions(-)
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch deleted +0 -16
deleted file mode 100644
index c83cd55..0000000
@@ -1,16 +0,0 @@
-Correct the directory path for gc_hal_eglplatform_type.h
-
-Signed-off-by: Henk Fijnvandraat <[email protected]>
-
-diff -rup gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
---- gpu-viv-bin-mx6q-1.1.0-orig/usr/include/gc_vdk_types.h	2012-12-18 10:35:55.000000000 +0100
-+++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h	2013-05-09 21:09:28.080138681 +0200
-@@ -39,7 +39,7 @@ extern "C" {
- #endif
- 
- #include <EGL/egl.h>
--#include "gc_hal_eglplatform_type.h"
-+#include <HAL/gc_hal_eglplatform_type.h>
- 
- 
- /*******************************************************************************
package/freescale-imx/gpu-viv-bin-mx6q/egl.pc deleted +0 -10
deleted file mode 100644
index d1d09a0..0000000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: egl
-Description: Freescale gpu-viv-bin-mx6q implementation of EGL
-Version: 1.0
-Libs: -L${libdir} -lGAL -lEGL
-Cflags: -I${includedir}/
package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc deleted +0 -10
deleted file mode 100644
index 74ce792..0000000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: glesv2
-Description: Freescale gpu-viv-bin-mx6q implementation of OpenGL ESv2
-Version: 2.0
-Libs: -L${libdir} -lGAL -lEGL -lGLESv2
-Cflags: -I${includedir}/
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +28 -19

94 lines not on this page · raw message

package/freescale-imx/gpu-viv-bin-mx6q/vg.pc deleted +0 -10
deleted file mode 100644
index 677a7ee..0000000
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: vg
-Description: Freescale gpu-viv-bin-mx6q implementation of OpenVG
-Version: 1.1
-Libs: -L${libdir} -lGAL -lEGL -lOpenVG
-Cflags: -I${includedir}/
Signature · 1 line
2.1.4
author
#8 lore raw

PATCH 8/13 gpu-viv-bin-mx6q: rename package to imx-gpu-viv

In reply to Gary Bisson

In order to be in line with new Freescale naming convention:

https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9

"Graphics recipe is renamed from gpu-viv-bin-mx6q to imx-gpu-viv"

Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9639f6f20991ab64ea75177a017f8749a

It is just the follow-up of previous patch in order to separate the package renaming from the update.

Regards,
Gary

---
 package/freescale-imx/Config.in                    |  2 +-
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk           | 98 ----------------------
 .../{gpu-viv-bin-mx6q => imx-gpu-viv}/Config.in    | 26 +++---
 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk   | 98 ++++++++++++++++++++++
 package/gstreamer1/gst1-imx/Config.in              |  6 +-
 package/gstreamer1/gst1-imx/gst1-imx.mk            |  2 +-
 package/qt5/qt5base/qt5base.mk                     |  2 +-
 package/x11r7/xdriver_xf86-video-imx-viv/Config.in |  6 +-
 .../xdriver_xf86-video-imx-viv.mk                  |  2 +-
 9 files changed, 121 insertions(+), 121 deletions(-)
 delete mode 100644 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
 rename package/freescale-imx/{gpu-viv-bin-mx6q => imx-gpu-viv}/Config.in (72%)
 create mode 100644 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
package/freescale-imx/Config.in +1 -1
index 72d3c59..dffe76f 100644
@@ -50,7 +50,7 @@ source "package/freescale-imx/gpu-amd-bin-mx51/Config.in"
 source "package/freescale-imx/libz160/Config.in"
 endif
 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
-source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
+source "package/freescale-imx/imx-gpu-viv/Config.in"
 endif
 
 endif
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk deleted +0 -98

98 lines not on this page · raw message

package/freescale-imx/imx-gpu-viv/Config.in renamed from package/freescale-imx/gpu-viv-bin-mx6q/Config.in +13 -13
similarity index 72%
rename from package/freescale-imx/gpu-viv-bin-mx6q/Config.in
rename to package/freescale-imx/imx-gpu-viv/Config.in
index db2a10e..2a0cf84 100644
@@ -1,9 +1,9 @@
-comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain"
+comment "imx-gpu-viv needs an (e)glibc toolchain"
 	depends on BR2_arm
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
-config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
-	bool "gpu-viv-bin-mx6q"
+config BR2_PACKAGE_IMX_GPU_VIV
+	bool "imx-gpu-viv"
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBGLES
 	select BR2_PACKAGE_HAS_LIBOPENVG

@@ -21,7 +21,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 	  This library is provided by Freescale as-is and doesn't have
 	  an upstream.
 
-if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
+if BR2_PACKAGE_IMX_GPU_VIV
 
 choice
 	prompt "Output option"

@@ -30,7 +30,7 @@ choice
 	  direct framebuffer access, one for X11 rendering.
 	  Choose here which version to install.
 
-config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
+config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
 	bool "X11"
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency

@@ -39,26 +39,26 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
 comment "X11 backend needs Xorg package"
 	depends on !BR2_PACKAGE_XORG7
 
-config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
+config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB
 	bool "Framebuffer"
 
 endchoice
 
-config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT
+config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT
 	string
-	default "x11" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
-	default "fb" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
+	default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
+	default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB
 
 config BR2_PACKAGE_PROVIDES_LIBEGL
-	default "gpu-viv-bin-mx6q"
+	default "imx-gpu-viv"
 
 config BR2_PACKAGE_PROVIDES_LIBGLES
-	default "gpu-viv-bin-mx6q"
+	default "imx-gpu-viv"
 
 config BR2_PACKAGE_PROVIDES_LIBOPENVG
-	default "gpu-viv-bin-mx6q"
+	default "imx-gpu-viv"
 
-config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES
+config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES
 	bool "install examples"
 	help
 	  Copy the Vivante examples to the target.
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk new file +98 -0

98 lines not on this page · raw message

package/gstreamer1/gst1-imx/Config.in +3 -3
index 840c0fb..f7284f4 100644
@@ -1,7 +1,7 @@
 comment "gst1-imx needs an imx-specific Linux kernel to be built"
 	depends on BR2_arm && !BR2_LINUX_KERNEL
 
-# Required by gpu-viv-bin-mx6q
+# Required by imx-gpu-viv
 comment "gst1-imx needs an (e)glibc toolchain"
 	depends on BR2_arm
 	depends on !BR2_TOOLCHAIN_USES_GLIBC

@@ -10,8 +10,8 @@ config BR2_PACKAGE_GST1_IMX
 	bool "gst1-imx"
 	depends on BR2_LINUX_KERNEL
 	depends on BR2_arm # Only relevant for i.MX
-	depends on BR2_TOOLCHAIN_USES_GLIBC # gpu-viv-bin-mx6q
-	depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q
+	depends on BR2_TOOLCHAIN_USES_GLIBC # imx-gpu-viv
+	depends on BR2_PACKAGE_IMX_GPU_VIV
 	depends on BR2_PACKAGE_LIBFSLVPUWRAP
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	help
package/gstreamer1/gst1-imx/gst1-imx.mk +1 -1
index 516babf..9ba7550 100644
@@ -13,7 +13,7 @@ GST1_IMX_LICENSE_FILES = LICENSE
 GST1_IMX_INSTALL_STAGING = YES
 
 GST1_IMX_DEPENDENCIES += host-pkgconf host-python \
-	gpu-viv-bin-mx6q gstreamer1 gst1-plugins-base libfslvpuwrap
+	imx-gpu-viv gstreamer1 gst1-plugins-base libfslvpuwrap
 
 # needs access to imx-specific kernel headers
 GST1_IMX_DEPENDENCIES += linux
package/qt5/qt5base/qt5base.mk +1 -1
index 3de824f..e300410 100644
@@ -115,7 +115,7 @@ QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA
 ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
 QT5BASE_CONFIGURE_OPTS += -eglfs
 QT5BASE_DEPENDENCIES   += libegl
-ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
+ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
 QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND
 QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
 	$(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
package/x11r7/xdriver_xf86-video-imx-viv/Config.in +3 -3
index 8926a50..baf7ca4 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
 	bool "xf86-video-imx-viv"
-	depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
+	depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
 	select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri
 	select BR2_PACKAGE_MESA3D_DRI_DRIVER
 	select BR2_PACKAGE_LIBDRM

@@ -26,6 +26,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
 	  this driver (else, Xorg will exit with an obscur message like
 	  "Segmentation fault at address 0xc").
 
-comment "xf86-video-imx-viv depends on gpu-viv-bin-mx6q with X11 output"
+comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output"
 	depends on BR2_arm
-	depends on !BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
+	depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +1 -1
index 1e9a665..fbd7325 100644
@@ -7,7 +7,7 @@
 XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 3.10.17-1.0.1
 XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE)
 XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz
-XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = gpu-viv-bin-mx6q xserver_xorg-server \
+XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \
 	xproto_xproto xproto_xf86driproto libdrm
 XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = GPLv2+
 XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES
Signature · 1 line
2.1.4
#9 lore raw

PATCH 8/13 gpu-viv-bin-mx6q: rename package to imx-gpu-viv

Dear Gary Bisson,

Quoted 7 lines · Gary Bisson

In order to be in line with new Freescale naming convention:

https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9

"Graphics recipe is renamed from gpu-viv-bin-mx6q to imx-gpu-viv"

Signed-off-by Gary Bisson <[email protected]>

You need to add Config.in.legacy handling when renaming a package.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#10 lore raw

PATCH 8/13 gpu-viv-bin-mx6q: rename package to imx-gpu-viv

Thomas, All,

Quoted 5 lines · Thomas Petazzoni

Dear Gary Bisson,

Quoted 2 lines · Gary Bisson

In order to be in line with new Freescale naming convention:

Quoted 7 lines
Quoted 5 lines

https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9

"Graphics recipe is renamed from gpu-viv-bin-mx6q to imx-gpu-viv"

Signed-off-by Gary Bisson <[email protected]>

You need to add Config.in.legacy handling when renaming a package.

Oops, didn't know about that file actually. I got a patch ready but I might wait a couple of days for other remarks before sending my v2.

Thanks,
Gary

author
#11 lore raw

PATCH 9/13 xdriver_xf86-video-imx-viv: bump to version 3.10.53-1.1.0 GA

In reply to Gary Bisson

Previous patch for the LoadExtension call isn't needed any more.

Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/f0440193ddb3eafa1b00aed294ed6dbd3e4d604d

I do not really remember why we switched the FREESCALE_IMX_VERSION to a specific version but decided but put it back in place in order to follow the rest of the packages.

I have used the following xorg.conf in order to force the use of the vivante module:
https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf

Regards,
Gary

---
 .../0001-Fix-LoadExtenions.patch                          | 15 ---------------
 .../xdriver_xf86-video-imx-viv.mk                         |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch deleted +0 -15
deleted file mode 100644
index 3e2d47c..0000000
@@ -1,15 +0,0 @@
-Fix compilation with Xorg xserver 1.16.
-
-Signed-off-by: J?r?me Pouiller <[email protected]>
-
---- a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c	2014-07-25 15:38:24.000000000 +0200
-+++ b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c	2014-10-02 21:00:58.755409342 +0200
-@@ -261,7 +261,7 @@
-         setupDone = TRUE;
-         xf86AddDriver(&FBDEV, module, HaveDriverFuncs);
-         if(gVivFb)
--            LoadExtension(&VIVExt, FALSE);
-+            LoadExtensionList(&VIVExt, 1, FALSE);
- 		return (pointer)1;
-     } else {
-         if (errmaj) *errmaj = LDR_ONCEONLY;
package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +1 -1
index fbd7325..f5cb946 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 3.10.17-1.0.1
+XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = $(FREESCALE_IMX_VERSION)
 XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE)
 XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz
 XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \
Signature · 1 line
2.1.4
author
#12 lore raw

PATCH 10/13 nitrogen6x_defconfig: bump version to 3.10.53_1.1.1_ga

In reply to Gary Bisson

Also update the dtb files to be generated.

Signed-off-by Gary Bisson <[email protected]>
---
 configs/nitrogen6x_defconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
configs/nitrogen6x_defconfig +5 -5
index d75f780..d04745d 100644
@@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2_2r1=y
 
 # Lock headers to match kernel
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # bootloader

@@ -21,15 +21,15 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/f870252/u-boot-f870252.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-boot-imx6/tarball/21eb4146/u-boot-21eb4146.tar.gz"
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Last version of branch boundary-imx_3.10.17_1.0.1_ga
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/tarball/ea957c5/linux-imx6-ea957c5.tar.gz"
+# Last version of branch boundary-imx_3.10.53_1.1.1_ga
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/tarball/98c0fdbe/linux-imx6-98c0fdbe.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_max imx6dl-nitrogen6x imx6q-nitrogen6_max imx6q-nitrogen6x imx6q-sabrelite"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6q-nitrogen6_max imx6q-sabrelite"
Signature · 1 line
2.1.4
#14 lore raw

PATCH 11/13 board/boundarydevices: update 6x_bootscript

Gary,

Quoted 7 lines · Gary Bisson

This script is executed by u-boot in order to detect the hardware configuration (board, displays etc...) and configure the bootargs and device tree accordingly.

This update is necessary due to the kernel bump to version 3.10.53.

Signed-off-by Gary Bisson <[email protected]>

I know this file is not introduced by your patch, but why do we have this binary file in Buildroot? Isn't there a source form of this file?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#15 lore raw

PATCH 11/13 board/boundarydevices: update 6x_bootscript

Thomas, All,

Quoted 7 lines · Thomas Petazzoni

Gary,

Quoted 4 lines · Gary Bisson

This script is executed by u-boot in order to detect the hardware configuration (board, displays etc...) and configure the bootargs and device tree accordingly.

Quoted 6 lines
Quoted 3 lines

This update is necessary due to the kernel bump to version 3.10.53.

Signed-off-by Gary Bisson <[email protected]>

I know this file is not introduced by your patch, but why do we have this binary file in Buildroot? Isn't there a source form of this file?

Yes actually there is, I just removed the Yocto-specific part of this script:
https://github.com/boundarydevices/u-boot-imx6/blob/staging/board/boundary/nitrogen6x/6x_bootscript-yocto-3.10.53.txt

Same goes for the other script/binary:
https://github.com/boundarydevices/u-boot-imx6/blob/staging/board/boundary/nitrogen6x/6x_upgrade.txt

I'll make a V2 that adds BR2_PACKAGE_HOST_UBOOT_TOOLS to the nitrogen6x_defconfig and modify our post-build.sh to generate the binaries from the .txt files.

Thanks,
Gary

#16 lore raw

PATCH 11/13 board/boundarydevices: update 6x_bootscript

Dear Gary Bisson,

Quoted 9 lines · Gary Bisson

Yes actually there is, I just removed the Yocto-specific part of this script:
https://github.com/boundarydevices/u-boot-imx6/blob/staging/board/boundary/nitrogen6x/6x_bootscript-yocto-3.10.53.txt

Same goes for the other script/binary:
https://github.com/boundarydevices/u-boot-imx6/blob/staging/board/boundary/nitrogen6x/6x_upgrade.txt

I'll make a V2 that adds BR2_PACKAGE_HOST_UBOOT_TOOLS to the nitrogen6x_defconfig and modify our post-build.sh to generate the binaries from the .txt files.

Excellent, thanks a lot!

Thoams

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#17 lore raw

PATCH 12/13 freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA

In reply to Gary Bisson
Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

I've updated all the configs making sure the tag was correct on Freescale repo but I have no board to try it on. Let me know if you get any issue with it.
http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/tag/?id=rel_imx_3.10.53_1.1.0_ga

Regards,
Gary

---
 configs/freescale_imx6dlsabreauto_defconfig | 6 +++---
 configs/freescale_imx6dlsabresd_defconfig   | 7 +++----
 configs/freescale_imx6qsabreauto_defconfig  | 6 +++---
 configs/freescale_imx6qsabresd_defconfig    | 7 +++----
 configs/freescale_imx6sololiteevk_defconfig | 5 ++---
 5 files changed, 14 insertions(+), 17 deletions(-)
configs/freescale_imx6dlsabreauto_defconfig +3 -3
index f4fc48a..6a80712 100644
@@ -7,7 +7,7 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
 # toolchain
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # system

@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

@@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
configs/freescale_imx6dlsabresd_defconfig +3 -4
index dd17358..0aac2de 100644
@@ -7,7 +7,7 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
 # toolchain
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # system

@@ -17,8 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-# Last version of branch imx_3.10.17_1.0.1_ga
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

@@ -33,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
configs/freescale_imx6qsabreauto_defconfig +3 -3
index 0831d24..f0d6a5e 100644
@@ -7,7 +7,7 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
 # toolchain
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # system

@@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

@@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
configs/freescale_imx6qsabresd_defconfig +3 -4
index 98ed7d4..a705534 100644
@@ -7,7 +7,7 @@ BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
 # toolchain
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # system

@@ -17,8 +17,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-# Last version of branch imx_3.10.17_1.0.1_ga
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

@@ -33,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
configs/freescale_imx6sololiteevk_defconfig +2 -3
index 93d842b..d4cca4e 100644
@@ -9,8 +9,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"
-# Last version of branch imx_3.10.17_1.0.1_ga
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

@@ -25,4 +24,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6slevk"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_3.10.53_1.1.0_ga"
Signature · 1 line
2.1.4
#18 lore raw

PATCH 1/1 imx6sabre: refresh u-boot patch

After bump to version to 3.10.53-1.1.0 GA.

Signed-off-by Vincent Stehl? <[email protected]>
Cc Gary Bisson <[email protected]>

---

Hi,

Thank you Gary for updating the Freescale "components" versions in buildroot.

I am testing a bit your patch queue and I needed to update one patch for proper build of u-boot with freescale_imx6qsabresd_defconfig.

Best regards,

V.

 ...abre_common-boot-Linux-to-init-in-mfgtools-mode.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch +8 -8
index c01df4e..9e2aebf 100644
@@ -1,4 +1,4 @@
-From 4a7cd7c5b165317dccf45cfc235da3e14bc339e8 Mon Sep 17 00:00:00 2001
+From 90ecc0ad14337898b75843efc6530fc4a34f7808 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <[email protected]>
 Date: Tue, 12 Aug 2014 10:17:31 +0200
 Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode

@@ -15,14 +15,14 @@ buildroot system entirely through USB.
 
 Signed-off-by: Vincent Stehl? <[email protected]>
 ---
- include/configs/mx6qsabre_common.h | 2 +-
+ include/configs/mx6sabre_common.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
-index 69ff0df..ec7b665 100644
---- a/include/configs/mx6qsabre_common.h
-+++ b/include/configs/mx6qsabre_common.h
-@@ -129,7 +129,7 @@
+diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
+index 93d4c4b..d2e7efd 100644
+--- a/include/configs/mx6sabre_common.h
++++ b/include/configs/mx6sabre_common.h
+@@ -106,7 +106,7 @@
  
  #define CONFIG_MFG_ENV_SETTINGS \
  	"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \

@@ -32,5 +32,5 @@ index 69ff0df..ec7b665 100644
  		"g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
  		"g_mass_storage.iSerialNumber=\"\" "\
 -- 
-2.0.1
+2.1.4
Signature · 1 line
2.1.4
#19 lore raw

PATCH 1/1 imx6sabre: refresh u-boot patch

Dear Vincent Stehl?,

Quoted 5 lines · Vincent Stehl?

After bump to version to 3.10.53-1.1.0 GA.

Signed-off-by Vincent Stehl? <[email protected]>
Cc Gary Bisson <[email protected]>

---

I've squashed this patch into Gary's patch doing the configuration change.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#20 lore raw

PATCH 13/13 qmx6_defconfig: bump version to 3.10.53_1.1.0

In reply to Gary Bisson
Signed-off-by Gary Bisson <[email protected]>

---
Hi all,

Same here I have no qmx6 to try on. Jerome, would you be able to give it a shot?

Regards,
Gary

---
 configs/qmx6_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/qmx6_defconfig +4 -4
index ff035a9..d693d82 100644
@@ -1,7 +1,7 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
 

@@ -10,8 +10,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_kernel.git"
-# Last version of branch cgt_imx_3.10.17_1.0.0
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9bafbcba67f7bb2a48a5e05998cecb1165aa444f"
+# Last version of branch cgt_imx_3.10.53_1.1.0
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="cea0de46e2c8f0a5c67f46005e84ae1d418731bc"
 BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

@@ -23,7 +23,7 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cgt_qmx6_pn016103"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_uboot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="6388c474189b42c07bb865dd604c74483da099f3"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="30ba236ef6df04e4cca58c3e06c4f63c2db12115"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx"
Signature · 1 line
2.1.4