* [Buildroot] [PATCH 01/13] libfslvpuwrap: bump version to 1.0.57
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 02/13] libfslcodec: bump version to 4.0.2 Gary Bisson
` (11 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
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 <gary.bisson@boundarydevices.com>
---
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
diff --git a/package/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch b/package/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
deleted file mode 100644
index 3927430..0000000
--- a/package/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7ca66c10c05168c7d342df7c7a70d4a1ae0629f7 Mon Sep 17 00:00:00 2001
-From: Eric Nelson <eric.nelson@boundarydevices.com>
-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 <laci@boundarydevices.com>
-Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
----
- 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
-
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
index 01b2999..625f586 100644
--- a/package/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/libfslvpuwrap/libfslvpuwrap.mk
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 02/13] libfslcodec: bump version to 4.0.2
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 01/13] libfslvpuwrap: bump version to 1.0.57 Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 03/13] libfslparser: " Gary Bisson
` (10 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
index fe6f0ba..665588a 100644
--- a/package/libfslcodec/libfslcodec.mk
+++ b/package/libfslcodec/libfslcodec.mk
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 03/13] libfslparser: bump version to 4.0.2
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 01/13] libfslvpuwrap: bump version to 1.0.57 Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 02/13] libfslcodec: bump version to 4.0.2 Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 04/13] gst-fsl-plugins: " Gary Bisson
` (9 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
New feature for 4.0.2 version:
* Enhanced Metadata supporting in MP4, MKV, AVI, ASF parser.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
index 706a10e..50f0bf6 100644
--- a/package/libfslparser/libfslparser.mk
+++ b/package/libfslparser/libfslparser.mk
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 04/13] gst-fsl-plugins: bump version to 4.0.2
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (2 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 03/13] libfslparser: " Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 05/13] imx-vpu: bump version to 5.4.27 Gary Bisson
` (8 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch b/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch
index 35617cd..471c483 100644
--- a/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch
+++ b/package/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch
@@ -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_"
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index 8d8b8b4..a7dea0f 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 05/13] imx-vpu: bump version to 5.4.27
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (3 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 04/13] gst-fsl-plugins: " Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 06/13] freescale-imx: bump to 3.10.53-1.1.0 GA release Gary Bisson
` (7 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
- 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 <gary.bisson@boundarydevices.com>
---
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
diff --git a/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
deleted file mode 100644
index ed93193..0000000
--- a/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
+++ /dev/null
@@ -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 <bisson.gary@gmail.com>
-[yann.morin.1998 at free.fr: expand the commit log]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- 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);
-
diff --git a/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch b/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
deleted file mode 100644
index 583a508..0000000
--- a/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-[PATCH] vpu-lib: fix IOGetVirtMem return value checks
-
-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 <bisson.gary@gmail.com>
-[yann.morin.1998 at free.fr: expand the commit log]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- vpu/vpu_lib.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
-index 1fb731b..7a7f42d 100644
---- a/vpu/vpu_lib.c
-+++ b/vpu/vpu_lib.c
-@@ -1764,7 +1764,7 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
- err_msg("Unable to obtain physical mem\n");
- return RETCODE_FAILURE;
- }
-- if (IOGetVirtMem(&pEncInfo->picParaBaseMem) <= 0) {
-+ if (IOGetVirtMem(&pEncInfo->picParaBaseMem) == -1) {
- IOFreePhyMem(&pEncInfo->picParaBaseMem);
- pEncInfo->picParaBaseMem.phy_addr = 0;
- err_msg("Unable to obtain virtual mem\n");
-@@ -2982,7 +2982,7 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info)
- UnlockVpu(vpu_semap);
- return RETCODE_FAILURE;
- }
-- if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+ if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
- IOFreePhyMem(&pDecInfo->userDataBufMem);
- pDecInfo->userDataBufMem.phy_addr = 0;
- err_msg("Unable to obtain virtual mem\n");
-@@ -4017,7 +4017,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
- UnlockVpu(vpu_semap);
- return RETCODE_FAILURE;
- }
-- if (IOGetVirtMem(&pDecInfo->picParaBaseMem) <= 0) {
-+ if (IOGetVirtMem(&pDecInfo->picParaBaseMem) == -1) {
- IOFreePhyMem(&pDecInfo->picParaBaseMem);
- pDecInfo->picParaBaseMem.phy_addr = 0;
- err_msg("Unable to obtain virtual mem\n");
-@@ -4057,7 +4057,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
- UnlockVpu(vpu_semap);
- return RETCODE_FAILURE;
- }
-- if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+ if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
- IOFreePhyMem(&pDecInfo->userDataBufMem);
- pDecInfo->userDataBufMem.phy_addr = 0;
- err_msg("Unable to obtain virtual mem\n");
-
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
index ab3634d..4c4a031 100644
--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 06/13] freescale-imx: bump to 3.10.53-1.1.0 GA release
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (4 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 05/13] imx-vpu: bump version to 5.4.27 Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 07/13] gpu-viv-bin-mx6q: bump to 5.0.11.p4.1 Gary Bisson
` (6 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
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 <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 64f3b6b..26c591b 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -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.
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 07/13] gpu-viv-bin-mx6q: bump to 5.0.11.p4.1
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (5 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 06/13] freescale-imx: bump to 3.10.53-1.1.0 GA release Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv Gary Bisson
` (5 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
From: Antoine Tenart <antoine.tenart@free-electrons.com>
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 <antoine.tenart@free-electrons.com>
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch b/package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch
deleted file mode 100644
index c83cd55..0000000
--- a/package/freescale-imx/gpu-viv-bin-mx6q/0001-correct-HAL-include.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Correct the directory path for gc_hal_eglplatform_type.h
-
-Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
-
-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>
-
-
- /*******************************************************************************
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
deleted file mode 100644
index d1d09a0..0000000
--- a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
+++ /dev/null
@@ -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}/
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
deleted file mode 100644
index 74ce792..0000000
--- a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
+++ /dev/null
@@ -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}/
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index ec779a4..678bfdf 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -4,14 +4,14 @@
#
################################################################################
-GPU_VIV_BIN_MX6Q_BASE_VERSION = 3.10.17-1.0.1
+GPU_VIV_BIN_MX6Q_BASE_VERSION = 5.0.11.p4.1
ifeq ($(BR2_ARM_EABIHF),y)
GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-hfp
else
GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-sfp
endif
GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
-GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
+GPU_VIV_BIN_MX6Q_SOURCE = imx-gpu-viv-$(GPU_VIV_BIN_MX6Q_VERSION).bin
GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
@@ -26,27 +26,36 @@ define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS
$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE))
endef
+# For some reason libGAL_egl for x11 is called libGAL_egl.dri.so
+ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),x11)
+define GPU_VIV_BIN_MX6Q_FIXUP_SYMLINKS
+ ln -sf libGAL_egl.dri.so $(@D)/gpu-core/usr/lib/libGAL_egl.so
+endef
+endif
+
# Instead of building, we fix up the inconsistencies that exist
# in the upstream archive here.
# Make sure these commands are idempotent.
define GPU_VIV_BIN_MX6Q_BUILD_CMDS
- $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/usr/include/*/*.h
- ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so
- ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1
- ln -sf libGL.so.1.2 $(@D)/usr/lib/libGL.so.1.2.0
- ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libEGL.so
- ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libEGL.so.1
- ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libEGL.so.1.0
- ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGLESv2.so
- ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGLESv2.so.2
- ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGLESv2.so.2.0.0
- ln -sf libVIVANTE-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libVIVANTE.so
- ln -sf libGAL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/usr/lib/libGAL.so
+ $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h
+ ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so
+ ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1
+ ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0
+ ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so
+ ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1
+ ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0
+ ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so
+ ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2
+ ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0
+ ln -sf libVIVANTE-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so
+ ln -sf libGAL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so
+ ln -sf libGAL_egl.$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL_egl.so
+ $(GPU_VIV_BIN_MX6Q_FIXUP_SYMLINKS)
endef
ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb)
define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS
- $(SED) '/#define EGLAPIENTRY/ a \
+ $(SED) '39i\
#if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
#define EGL_API_FB \n\
#endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h
@@ -54,11 +63,11 @@ endef
endif
define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
- cp -r $(@D)/usr/* $(STAGING_DIR)/usr
+ cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
$(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS)
for lib in egl glesv2 vg; do \
$(INSTALL) -m 0644 -D \
- package/freescale-imx/gpu-viv-bin-mx6q/$${lib}.pc \
+ $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
done
endef
@@ -66,7 +75,7 @@ endef
ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y)
define GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES
mkdir -p $(TARGET_DIR)/usr/share/examples/
- cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/
+ cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/
endef
endif
@@ -75,7 +84,7 @@ endif
# to the wrong library
define GPU_VIV_BIN_MX6Q_INSTALL_TARGET_CMDS
$(GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES)
- cp -a $(@D)/usr/lib $(TARGET_DIR)/usr
+ cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr
for lib in EGL GAL VIVANTE GLESv2; do \
for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
case $$f in \
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
deleted file mode 100644
index 677a7ee..0000000
--- a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
+++ /dev/null
@@ -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}/
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (6 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 07/13] gpu-viv-bin-mx6q: bump to 5.0.11.p4.1 Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-21 9:34 ` Thomas Petazzoni
2015-05-20 10:12 ` [Buildroot] [PATCH 09/13] xdriver_xf86-video-imx-viv: bump to version 3.10.53-1.1.0 GA Gary Bisson
` (4 subsequent siblings)
12 siblings, 1 reply; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
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 <gary.bisson@boundarydevices.com>
---
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
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 72d3c59..dffe76f 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -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
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
deleted file mode 100644
index 678bfdf..0000000
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-################################################################################
-#
-# gpu-viv-bin-mx6q
-#
-################################################################################
-
-GPU_VIV_BIN_MX6Q_BASE_VERSION = 5.0.11.p4.1
-ifeq ($(BR2_ARM_EABIHF),y)
-GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-hfp
-else
-GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-sfp
-endif
-GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
-GPU_VIV_BIN_MX6Q_SOURCE = imx-gpu-viv-$(GPU_VIV_BIN_MX6Q_VERSION).bin
-
-GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
-
-GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement
-GPU_VIV_BIN_MX6Q_LICENSE_FILES = EULA
-GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
-
-GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
-GPU_VIV_BIN_MX6Q_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT))
-
-define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS
- $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE))
-endef
-
-# For some reason libGAL_egl for x11 is called libGAL_egl.dri.so
-ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),x11)
-define GPU_VIV_BIN_MX6Q_FIXUP_SYMLINKS
- ln -sf libGAL_egl.dri.so $(@D)/gpu-core/usr/lib/libGAL_egl.so
-endef
-endif
-
-# Instead of building, we fix up the inconsistencies that exist
-# in the upstream archive here.
-# Make sure these commands are idempotent.
-define GPU_VIV_BIN_MX6Q_BUILD_CMDS
- $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h
- ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so
- ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1
- ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0
- ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so
- ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1
- ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0
- ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so
- ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2
- ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0
- ln -sf libVIVANTE-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so
- ln -sf libGAL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so
- ln -sf libGAL_egl.$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL_egl.so
- $(GPU_VIV_BIN_MX6Q_FIXUP_SYMLINKS)
-endef
-
-ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb)
-define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS
- $(SED) '39i\
- #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
- #define EGL_API_FB \n\
- #endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h
-endef
-endif
-
-define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
- cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
- $(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS)
- for lib in egl glesv2 vg; do \
- $(INSTALL) -m 0644 -D \
- $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
- $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
- done
-endef
-
-ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y)
-define GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES
- mkdir -p $(TARGET_DIR)/usr/share/examples/
- cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/
-endef
-endif
-
-# On the target, remove the unused libraries.
-# Note that this is _required_, else ldconfig may create symlinks
-# to the wrong library
-define GPU_VIV_BIN_MX6Q_INSTALL_TARGET_CMDS
- $(GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES)
- cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr
- for lib in EGL GAL VIVANTE GLESv2; do \
- for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
- case $$f in \
- *-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so) : ;; \
- *) $(RM) $$f ;; \
- esac; \
- done; \
- done
-endef
-
-$(eval $(generic-package))
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in
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
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/imx-gpu-viv/Config.in
@@ -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.
diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
new file mode 100644
index 0000000..ef2399f
--- /dev/null
+++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
@@ -0,0 +1,98 @@
+################################################################################
+#
+# imx-gpu-viv
+#
+################################################################################
+
+IMX_GPU_VIV_BASE_VERSION = 5.0.11.p4.1
+ifeq ($(BR2_ARM_EABIHF),y)
+IMX_GPU_VIV_VERSION = $(IMX_GPU_VIV_BASE_VERSION)-hfp
+else
+IMX_GPU_VIV_VERSION = $(IMX_GPU_VIV_BASE_VERSION)-sfp
+endif
+IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE)
+IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin
+
+IMX_GPU_VIV_INSTALL_STAGING = YES
+
+IMX_GPU_VIV_LICENSE = Freescale Semiconductor Software License Agreement
+IMX_GPU_VIV_LICENSE_FILES = EULA
+IMX_GPU_VIV_REDISTRIBUTE = NO
+
+IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg
+IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
+
+define IMX_GPU_VIV_EXTRACT_CMDS
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE))
+endef
+
+# For some reason libGAL_egl for x11 is called libGAL_egl.dri.so
+ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
+define IMX_GPU_VIV_FIXUP_SYMLINKS
+ ln -sf libGAL_egl.dri.so $(@D)/gpu-core/usr/lib/libGAL_egl.so
+endef
+endif
+
+# Instead of building, we fix up the inconsistencies that exist
+# in the upstream archive here.
+# Make sure these commands are idempotent.
+define IMX_GPU_VIV_BUILD_CMDS
+ $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h
+ ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so
+ ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1
+ ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0
+ ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so
+ ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1
+ ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0
+ ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so
+ ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2
+ ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0
+ ln -sf libVIVANTE-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so
+ ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so
+ ln -sf libGAL_egl.$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL_egl.so
+ $(IMX_GPU_VIV_FIXUP_SYMLINKS)
+endef
+
+ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
+define IMX_GPU_VIV_FIXUP_FB_HEADERS
+ $(SED) '39i\
+ #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
+ #define EGL_API_FB \n\
+ #endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h
+endef
+endif
+
+define IMX_GPU_VIV_INSTALL_STAGING_CMDS
+ cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
+ $(IMX_GPU_VIV_FIXUP_FB_HEADERS)
+ for lib in egl glesv2 vg; do \
+ $(INSTALL) -m 0644 -D \
+ $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
+ $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
+ done
+endef
+
+ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y)
+define IMX_GPU_VIV_INSTALL_EXAMPLES
+ mkdir -p $(TARGET_DIR)/usr/share/examples/
+ cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/
+endef
+endif
+
+# On the target, remove the unused libraries.
+# Note that this is _required_, else ldconfig may create symlinks
+# to the wrong library
+define IMX_GPU_VIV_INSTALL_TARGET_CMDS
+ $(IMX_GPU_VIV_INSTALL_EXAMPLES)
+ cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr
+ for lib in EGL GAL VIVANTE GLESv2; do \
+ for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
+ case $$f in \
+ *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \
+ *) $(RM) $$f ;; \
+ esac; \
+ done; \
+ done
+endef
+
+$(eval $(generic-package))
diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in
index 840c0fb..f7284f4 100644
--- a/package/gstreamer1/gst1-imx/Config.in
+++ b/package/gstreamer1/gst1-imx/Config.in
@@ -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
diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk
index 516babf..9ba7550 100644
--- a/package/gstreamer1/gst1-imx/gst1-imx.mk
+++ b/package/gstreamer1/gst1-imx/gst1-imx.mk
@@ -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
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 3de824f..e300410 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -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
diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
index 8926a50..baf7ca4 100644
--- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
@@ -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
diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
index 1e9a665..fbd7325 100644
--- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
@@ -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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv
2015-05-20 10:12 ` [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv Gary Bisson
@ 2015-05-21 9:34 ` Thomas Petazzoni
2015-05-21 12:13 ` Gary Bisson
0 siblings, 1 reply; 21+ messages in thread
From: Thomas Petazzoni @ 2015-05-21 9:34 UTC (permalink / raw)
To: buildroot
Dear Gary Bisson,
On Wed, 20 May 2015 12:12:19 +0200, Gary Bisson wrote:
> 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 <gary.bisson@boundarydevices.com>
You need to add Config.in.legacy handling when renaming a package.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv
2015-05-21 9:34 ` Thomas Petazzoni
@ 2015-05-21 12:13 ` Gary Bisson
0 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-21 12:13 UTC (permalink / raw)
To: buildroot
Thomas, All,
On Thu, May 21, 2015 at 11:34 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Gary Bisson,
>
> On Wed, 20 May 2015 12:12:19 +0200, Gary Bisson wrote:
>> 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 <gary.bisson@boundarydevices.com>
>
> 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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 09/13] xdriver_xf86-video-imx-viv: bump to version 3.10.53-1.1.0 GA
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (7 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 10/13] nitrogen6x_defconfig: bump version to 3.10.53_1.1.1_ga Gary Bisson
` (3 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
Previous patch for the LoadExtension call isn't needed any more.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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
diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch b/package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
deleted file mode 100644
index 3e2d47c..0000000
--- a/package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix compilation with Xorg xserver 1.16.
-
-Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
-
---- 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;
diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
index fbd7325..f5cb946 100644
--- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
@@ -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 \
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 10/13] nitrogen6x_defconfig: bump version to 3.10.53_1.1.1_ga
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (8 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 09/13] xdriver_xf86-video-imx-viv: bump to version 3.10.53-1.1.0 GA Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript Gary Bisson
` (2 subsequent siblings)
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
Also update the dtb files to be generated.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
configs/nitrogen6x_defconfig | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index d75f780..d04745d 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -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"
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (9 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 10/13] nitrogen6x_defconfig: bump version to 3.10.53_1.1.1_ga Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-21 17:05 ` Thomas Petazzoni
2015-05-20 10:12 ` [Buildroot] [PATCH 12/13] freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 13/13] qmx6_defconfig: bump version to 3.10.53_1.1.0 Gary Bisson
12 siblings, 1 reply; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
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 <gary.bisson@boundarydevices.com>
---
board/boundarydevices/nitrogen6x/6x_bootscript | Bin 3207 -> 4682 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/board/boundarydevices/nitrogen6x/6x_bootscript b/board/boundarydevices/nitrogen6x/6x_bootscript
index 05442a6b0eeffafabdf8857fc57fed73b5b6cbac..5b51e3544b6bf275703edb8319d327ef71b367ae 100644
GIT binary patch
literal 4682
zcmbVQ-EP}96b=e>fDH at -dbhh%)j&JIb|lAf(q$UfHeFjFU5BRY2JAwhCE6yUA6KFi
zWrg2hPqB9yuqWAb>>N at QCCBNK>LQjIp8xNBJoLl6U%&tB%Xk0$@_YB+ot=B#o$C4f
z_^Utf-uYr at nq?A-Fc(W{{<ZOW?+z^#T=MiBXgka21w4G%?TQ)nKF*4DoUsVsB6+#w
zYkCpI+4@@#JonJ02UgG1^Pwyy9D!W$v<vu<Hjyl|T*5%wt-YCuc_IGb-I-7pgye-B
z7T}Z)_&$F0A~{W2!X2ZnQ!V(8NXm(G)a{^SMy#BizBzeQNruanm8!+abER<|#RHV)
zaZCRA<d)I}?{>B*|3JDisFrt?>S at OEsNtIW?iXyDqcalqk(>$B`rG at cHm-;GucOU`
zm883*Et!l&zOK_%E%>|iva7_Z>dqn=uqevGExnN{o%_E<?$tuplqped68C^oT<`97
z8a5YVzCfF^>gn>Ba>&C)2F`ta;CY^BIS|f7I!A<=n2aGRIxmIPNq7K*s}H<9e*Fp}
zgmEZEmUhJ`#Bb-|!4btsUzd3{<><%0TRX0O(Ar?Z&bd~TWT}u@zKJ!RaTdqfMUZA`
z$XTt(giD^Q2I|#sNf`!<C=tUfjV}Wf@;wZv3ZK^C+4ComWDzew>E;n+sdj|=M+L7k
zb}J*UHG;kluC>tzwu(ds3A+SL51Y*}gFGUuh)P{5s&AeEMG;{4FJpFT>R071%{DVf
z{k^?XC-09>o0YQNOeAn$kwAPN6#)^<(zZ>bSc*`7hG at lN2p23(c?_ghd99tz&e$dM
z+|jt4xGu(`SL3-iI&@1Uu6l{Y3oIH1jGGX*5JywMD1{tQS- at -jhy1Ei03ww<pRte!
zOHl^1M1u47#naK)Y3z@tyA;cy^7024W<}hOm}G+s5y=I7HyVH6PIKFO?I)>G8R>RA
zHnA#f7amPBDYJxt^OKNyHs|Ric+JXh>P94V2c!cTs_KoACaXqkxMPdxM!E;OH-5}H
zFG3b`s4_t5HlVEaQ at S*4DvVo*Y*%2=)u;nvr?b(udxzGw27x=}$??;{ufM%`V$P2x
zLo_(mQPe^ILUcRLdEry(`>OOEgNF^27{{AJ2%)}$P%YF1k)rOcIWUVg5m-u?$^Fuu
z1hN=f=X&)k=Cl={1A~;)$%v^J)0`2%*{-My at JTxjQNO7NZPD3tO}(_AAhT7tfG|rD
zSaHl1FJ70xZGC2{dF80DF=NYR<Qsjandl1WJ$NLu<u=5(vS-@cz(ciBph030rNNFN
z&cu9`bJbNI%<xotS-}#t2qkO_!2}~}1><~8GIm+fN+YOX1V}n^RRBSdD$w$}h0D)%
z-LT&k*G*2Wd&uq<)pq%oURxEP?Q+G=H*>j_rQ3L|W;j!=c2$nx0f>2;AqY5)C0L*o
z=VBb-3Obu6LBdMpWT6Ht%fpR{1WukEH_o?e5Yku=BOI--OeAB=ZJWDkR%kNu071D*
zBY1cE3`e-}*4}I(3E6{xAoh?&7&K_0!622*Ed+uxWM$Zp^9PfI(fFW0IGBw4BYb`Q
z*gM$k?-5Hr9v$xW2ZxjWJ=b&lll}d at NzE;{GqUNe%DC>4#&I={>JGkX-k!Y0u5h=d
zjRuyD%;{M~qaldH#t7dmiG~YJuBz~QKBA*>(<iF@wN?y1Y+V{Qs-m~`w`Mc+&dep+
z$Y#DBd;B2H6<N%EDKBw2_4=N-k5z{AgvQU%AG_{rVtd*%jaho;yO85td%=WsS~)6}
z&LzW39$iN2Vi1yO)%Q%iME&3tIQAejfMafxHrP+NOSb)89Oie6h}9NRRF6$`+oT6;
zr>(4t>2 at P}pZ)t;HjTI?Y;aYJRTtyN9oTH8&l}lFl5iTIjh3w-jTTjI^TmALLhasm
zwH1?XMLu2i*)-<CT+G?}`eIpV;pJi26tV~~H+DPYU&ILuZ=&=f4v~(BxZCe3A%m)`
zI_Jw(!jqdQoinYK#u_~HvsH15KTG&Mt>JnL#R6}Ccyw4BbdD@@ybOT8ZEsDb62l)w
wte6tP6=UjVzqQ!Q@#<B==DgK&iT$Bv0QN49CDvThzGt8DobFA6)HvP$0E?fW<NyEw
literal 3207
zcmd5<&2HO95H<p&fQTG>>1|37=%JEKGO{YfAW|oB+yL<<0g~Q?C3h(;Omby%B~vwY
z=u70#C+exUK1ko7vr8^XF^XZghjuR_IkWTo&5yo&{LP2o|MEY*|Lxa5kB**P9M$LR
zN8TTgAANNc3L&A0a=wy=)cbw%Tz%j%IJa at JO9Y|#MCEqHcItr_SG#8(c<#(q2iE7=
zW-Lnyry!Rsvj7jvHo()B$R&(q%j(2DVFmw%Su81-<}8?0%*rZ~FABU#!i3Fl2$%Cz
zP!@<dwqkBsHDks~8Ho(sQ_JFh1e9&SgHsF5Rj;dDgbdvB#5Lv&`Wl=@*M?Ijg0zg{
z(7CMz@1CK=U`bOx^!%Ay{@}ZpKTh2tkArs?FZ_vR<i%miQn2+;;Lk4Y(~4BCaxg|Z
z=HYwrDwhW=S_-g7`amY&r&pJ6AQc&xB1aL*Q{$H3cgmgoE2k0~4&T0dG5Y!9tafKQ
zomvBooMeRr+qGfDuE7{xr*m-7Vb9eL>ooQ_5H%_^yCL#e19V6Wcwksw=ZqB*Nf;pB
zRtedf*zBkI>8y!}0)X;kT!39FH$S4EHUt5_IxCW~#O{040O3B6P|?$fK-gctYayXy
zIKYBpEX!FDD4rqmScCoGJY1RUPs%AOyF(YU43VV@^M9O3gOdY}#`2_er*m11+c-JR
zqlRFcJ49i|RMIg0Jj{vYBD0$`-%Cs9X3!O*<5Z=kUx$^6AjLXb0yY?#izH!9N$$gL
z@&(vkZx&=9a;@DpjsyFt at 0R{#4 at 3S$b&nb^4dctVXJ at 02AG+15*i1!ryXL(B9MPdu
z3;&;1J(f*5nYq21zggncsC(3;LWk*57+xxxmV5wthg&?(6dW0M_9diKk+Ej(9FXnk
zK4%6~!(g|`KpYh!VS$ueoHE|f^G<x6n46R&iHL#;7PrEh;t3OyT?H=WI0)77vvCfz
z9j(+dR|MxNHng%ql~Ss{23|EeOe-&lR6qpV4DPmo`s1);uF at SG<NP}=C}}j})plH~
z;okI_brBv`qPV)}AL%p#bXk}e^LsCeX&QyemAl$=#Yn(1Qp1+YFe51oY at U`=EU#|R
zr|;ogJwBq<x(%SYp+c+g?yg65ga)6}3ZyALUAgs83I)k&D_6e;1qpMOU^i5^J{RZQ
zYPQ`NNooV?Ktv-$(S@Wu-|b-pKLp2$a%_ybd$&WB>fNpt=hU_|VwYsY at LS;3g at o-W
zrgBaw&2j(oyh=h-n~JvNizU+H`qUed5o9bglc1~|Ql)Y;&qNk6(kSnzzb!eev$@*d
z#v)6$bG)Msth&AW1TW9eaNnY=04<qOz->}*VQO7P1nlAMA&PJ%HQ=iBq0yr+sv81X
zQ!XGSTfmi-#4(E`qi8 at 4m%B4$w(mAW>o+M`uqH%ZXgGC at _nXH+0U~X;^L7OF2qW-n
gK<Md%_Er9!=efv1{XyW_0<Kt&OBSyEXoYS44XUZ}y8r+H
--
2.1.4
^ permalink raw reply [flat|nested] 21+ messages in thread* [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript
2015-05-20 10:12 ` [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript Gary Bisson
@ 2015-05-21 17:05 ` Thomas Petazzoni
2015-05-22 7:57 ` Gary Bisson
0 siblings, 1 reply; 21+ messages in thread
From: Thomas Petazzoni @ 2015-05-21 17:05 UTC (permalink / raw)
To: buildroot
Gary,
On Wed, 20 May 2015 12:12:22 +0200, Gary Bisson wrote:
> 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 <gary.bisson@boundarydevices.com>
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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript
2015-05-21 17:05 ` Thomas Petazzoni
@ 2015-05-22 7:57 ` Gary Bisson
2015-05-22 8:07 ` Thomas Petazzoni
0 siblings, 1 reply; 21+ messages in thread
From: Gary Bisson @ 2015-05-22 7:57 UTC (permalink / raw)
To: buildroot
Thomas, All,
On Thu, May 21, 2015 at 7:05 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Gary,
>
> On Wed, 20 May 2015 12:12:22 +0200, Gary Bisson wrote:
>> 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 <gary.bisson@boundarydevices.com>
>
> 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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 12/13] freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (10 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
2015-05-21 9:10 ` [Buildroot] [PATCH] imx6sabre: refresh u-boot patch Vincent Stehlé
2015-05-20 10:12 ` [Buildroot] [PATCH 13/13] qmx6_defconfig: bump version to 3.10.53_1.1.0 Gary Bisson
12 siblings, 1 reply; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig
index f4fc48a..6a80712 100644
--- a/configs/freescale_imx6dlsabreauto_defconfig
+++ b/configs/freescale_imx6dlsabreauto_defconfig
@@ -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"
diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig
index dd17358..0aac2de 100644
--- a/configs/freescale_imx6dlsabresd_defconfig
+++ b/configs/freescale_imx6dlsabresd_defconfig
@@ -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"
diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig
index 0831d24..f0d6a5e 100644
--- a/configs/freescale_imx6qsabreauto_defconfig
+++ b/configs/freescale_imx6qsabreauto_defconfig
@@ -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"
diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig
index 98ed7d4..a705534 100644
--- a/configs/freescale_imx6qsabresd_defconfig
+++ b/configs/freescale_imx6qsabresd_defconfig
@@ -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"
diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig
index 93d842b..d4cca4e 100644
--- a/configs/freescale_imx6sololiteevk_defconfig
+++ b/configs/freescale_imx6sololiteevk_defconfig
@@ -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"
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Buildroot] [PATCH] imx6sabre: refresh u-boot patch
2015-05-20 10:12 ` [Buildroot] [PATCH 12/13] freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA Gary Bisson
@ 2015-05-21 9:10 ` Vincent Stehlé
2015-07-11 11:30 ` Thomas Petazzoni
0 siblings, 1 reply; 21+ messages in thread
From: Vincent Stehlé @ 2015-05-21 9:10 UTC (permalink / raw)
To: buildroot
After bump to version to 3.10.53-1.1.0 GA.
Signed-off-by: Vincent Stehl? <vincent.stehle@freescale.com>
Cc: Gary Bisson <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
index c01df4e..9e2aebf 100644
--- a/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
+++ b/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
@@ -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?= <vincent.stehle@freescale.com>
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? <vincent.stehle@freescale.com>
---
- 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
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Buildroot] [PATCH 13/13] qmx6_defconfig: bump version to 3.10.53_1.1.0
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
` (11 preceding siblings ...)
2015-05-20 10:12 ` [Buildroot] [PATCH 12/13] freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA Gary Bisson
@ 2015-05-20 10:12 ` Gary Bisson
12 siblings, 0 replies; 21+ messages in thread
From: Gary Bisson @ 2015-05-20 10:12 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
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(-)
diff --git a/configs/qmx6_defconfig b/configs/qmx6_defconfig
index ff035a9..d693d82 100644
--- a/configs/qmx6_defconfig
+++ b/configs/qmx6_defconfig
@@ -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"
--
2.1.4
^ permalink raw reply related [flat|nested] 21+ messages in thread