* [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6
@ 2015-01-16 23:33 Jérôme Pouiller
2015-01-16 23:33 ` [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium Jérôme Pouiller
` (15 more replies)
0 siblings, 16 replies; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:33 UTC (permalink / raw)
To: buildroot
Hello,
Main purpose of this serie is to add support of Vivante GPU (found on imx6) to
Xorg. This work is mainly adapted from Yocto.
v6:
- Rebase on master
- Add license for xdriver_xf86-video-imx-viv. Notice this package does not
provide any license file.
- Fix typos suggested by Thomas P.
- Fix dependency on libdrm (gpu-viv-bin-mx6q does not depends on libdrm, but
xdriver_xf86-video-imx-viv does depend)
- Add a note about runtime dependencies in gpu-viv-bin-mx6q
- Splited patch 6/15 in 3 parts
- Splited patch 10/15 in 2 parts
- Make 0001-Force_egl_visual_ID_33.patch contionnal
v5:
- Add references in commit log of xdriver_xf86-video-imx-viv
- Split qmx6_defconfig in two defconfig: a minimal one and a demo one
v4:
- Fix example config in commit log of xdriver_xf86-video-imx-viv
- Add a note about OpenGL API in xdriver_xf86-video-imx-viv help
v3:
- Respin on next
- Add patch to use self-extractible helper function
- Remove 'See freescale-imx.mk' comment
- Reword patch "gpu-viv-bin-mx6q: change output selection mecanisms"
- libdrm: Apply new patch naming policy
- xdriver_xf86-video-imx-viv: Apply new patch naming policy
- xdriver_xf86-video-imx-viv: Does not depends directly on glibc
- qt5base: Apply new patch naming policy
- qmx6_defconfig: Use internal toochain
v2:
- Rebase on new version of mesa3d
- Reorder some patches (in order to make examples I provide in commit message
functional)
- Do not bump version of all freescale packages
- Bump kernel version of imx6 boards
J?r?me Pouiller (15):
mesa3d: Give possibility to external backends to enable DRI/Gallium
gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB
gpu-viv-bin-mx6q: make fb/x11 choice explicit
gpu-viv-bin-mx6q: remove useless build time deps
gpu-viv-bin-mx6q: add version in libraries symlinks
gpu-viv-bin-mx6q: change output selection mechanism
xdriver_xf86-video-imx-viv: new package
qt5base: apply new patch naming policy
qt5base: fix compilation with Vivante headers.
qt5base: fix "Unable to find an X11 visual" error
Vivante drivers: bump to version 3.10.17-1.0.1
nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga
freescale_imx6*_defconfig: bump kernel to 3.10.17_1.0.1_ga
qmx6_defconfig: update
qmx6_qt5_demo_defconfig: new defconfig
board/congatec/qmx6/6q_bootscript.txt | 2 -
board/congatec/qmx6/post-build.sh | 7 ---
configs/freescale_imx6dlsabresd_defconfig | 3 +-
configs/freescale_imx6qsabresd_defconfig | 3 +-
configs/freescale_imx6sololiteevk_defconfig | 3 +-
configs/nitrogen6x_defconfig | 3 +-
configs/qmx6_defconfig | 25 +++++++--
configs/qmx6_qt5_demo_defconfig | 57 ++++++++++++++++++++
package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 28 +++++++++-
package/freescale-imx/gpu-viv-bin-mx6q/egl.pc | 2 +-
package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc | 2 +-
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 36 ++++++-------
package/freescale-imx/gpu-viv-bin-mx6q/vg.pc | 2 +-
package/mesa3d/mesa3d.mk | 4 +-
.../qt5/qt5base/0001-Force_egl_visual_ID_33.patch | 26 +++++++++
...kspecs-files.patch => 0002-mkspecs-files.patch} | 0
...clibc-no-lfs.patch => 0003-uclibc-no-lfs.patch} | 0
package/qt5/qt5base/0004-xcb-egl-fixes.patch | 63 ++++++++++++++++++++++
package/qt5/qt5base/qt5base.mk | 6 ++-
package/x11r7/Config.in | 1 +
.../0001-Fix-LoadExtenions.patch | 15 ++++++
package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 31 +++++++++++
.../xdriver_xf86-video-imx-viv.mk | 33 ++++++++++++
23 files changed, 308 insertions(+), 44 deletions(-)
delete mode 100644 board/congatec/qmx6/6q_bootscript.txt
delete mode 100755 board/congatec/qmx6/post-build.sh
create mode 100644 configs/qmx6_qt5_demo_defconfig
create mode 100644 package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
rename package/qt5/qt5base/{qt5base-0002-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{qt5base-0003-uclibc-no-lfs.patch => 0003-uclibc-no-lfs.patch} (100%)
create mode 100644 package/qt5/qt5base/0004-xcb-egl-fixes.patch
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/Config.in
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
--
1.9.1
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
@ 2015-01-16 23:33 ` Jérôme Pouiller
2015-01-17 17:02 ` Bernd Kuhls
2015-04-30 8:16 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:33 ` [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB Jérôme Pouiller
` (14 subsequent siblings)
15 siblings, 2 replies; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/mesa3d/mesa3d.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index f6f6b0f..e96bba6 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -64,7 +64,7 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
-ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
MESA3D_CONF_OPTS += \
--without-gallium-drivers
else
@@ -73,7 +73,7 @@ MESA3D_CONF_OPTS += \
--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
endif
-ifeq ($(MESA3D_DRI_DRIVERS-y),)
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_CONF_OPTS += \
--without-dri-drivers --without-dri --disable-dri3
else
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
2015-01-16 23:33 ` [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium Jérôme Pouiller
@ 2015-01-16 23:33 ` Jérôme Pouiller
2015-04-30 8:21 ` [Buildroot] [v6, " Gary Bisson
2015-04-30 8:30 ` [Buildroot] [PATCH v6 " Thomas Petazzoni
2015-01-16 23:33 ` [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit Jérôme Pouiller
` (13 subsequent siblings)
15 siblings, 2 replies; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:33 UTC (permalink / raw)
To: buildroot
To compile with Vivante header and use framebuffer, it is necessary to
pass option -DEGL_API_FB. This option is declared in pkg-config file of
Vivante library. But many packages (especialy qt5 components) does not
consider these flags.
So instead of patching every packages that use EGL, it is more
convenient to patch Vivante headers.
This commit add #define EGL_API_FB on top of eglvivante.h when
necessary.
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/gpu-viv-bin-mx6q/egl.pc | 2 +-
package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc | 2 +-
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 10 ++++++----
package/freescale-imx/gpu-viv-bin-mx6q/vg.pc | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
index c984247..d1d09a0 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
@@ -7,4 +7,4 @@ Name: egl
Description: Freescale gpu-viv-bin-mx6q implementation of EGL
Version: 1.0
Libs: -L${libdir} -lGAL -lEGL
-Cflags: -I${includedir}/ -DEGL_API_FB=1
+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
index 7cfb5e7..74ce792 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
@@ -7,4 +7,4 @@ Name: glesv2
Description: Freescale gpu-viv-bin-mx6q implementation of OpenGL ESv2
Version: 2.0
Libs: -L${libdir} -lGAL -lEGL -lGLESv2
-Cflags: -I${includedir}/ -DEGL_API_FB=1
+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 79c7a92..eb54b80 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
@@ -48,14 +48,16 @@ endef
define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
cp -r $(@D)/usr/* $(STAGING_DIR)/usr
+ if [ $(GPU_VIV_BIN_MX6Q_LIB_TARGET) == fb ]; then \
+ $(SED) '/#define EGLAPIENTRY/ a \
+ #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; \
+ fi
for lib in egl glesv2 vg; do \
$(INSTALL) -m 0644 -D \
package/freescale-imx/gpu-viv-bin-mx6q/$${lib}.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
- if [ "$(GPU_VIV_BIN_MX6Q_LIB_TARGET)" != "fb" ]; then \
- $(SED) "s/-DEGL_API_FB=1//" \
- $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
- fi; \
done
endef
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
index fb14005..677a7ee 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
@@ -7,4 +7,4 @@ Name: vg
Description: Freescale gpu-viv-bin-mx6q implementation of OpenVG
Version: 1.1
Libs: -L${libdir} -lGAL -lEGL -lOpenVG
-Cflags: -I${includedir}/ -DEGL_API_FB=1
+Cflags: -I${includedir}/
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
2015-01-16 23:33 ` [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium Jérôme Pouiller
2015-01-16 23:33 ` [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB Jérôme Pouiller
@ 2015-01-16 23:33 ` Jérôme Pouiller
2015-04-30 8:29 ` [Buildroot] [v6, " Gary Bisson
2015-04-30 8:31 ` [Buildroot] [PATCH v6 " Thomas Petazzoni
2015-01-16 23:34 ` [Buildroot] [PATCH v6 04/15] gpu-viv-bin-mx6q: remove useless build time deps Jérôme Pouiller
` (12 subsequent siblings)
15 siblings, 2 replies; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:33 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 23 ++++++++++++++++++++--
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 2 +-
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 4e83dd3..0947f17 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -7,8 +7,6 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
select BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_HAS_LIBOPENVG
- select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
depends on BR2_arm # Only relevant for i.MX6
# Library binaries are linked against libc.so.6
depends on BR2_TOOLCHAIN_USES_GLIBC
@@ -25,6 +23,27 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
+choice
+ prompt "Output option"
+ help
+ There are two versions of this library: one for
+ direct framebuffer access, one for X11 rendering.
+ Choose here which version to install.
+
+config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
+ depends on BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXDAMAGE
+ select BR2_PACKAGE_XLIB_LIBXEXT
+ bool "X11"
+
+comment "X11 backend needs Xorg package"
+ depends on !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
+ bool "Framebuffer"
+
+endchoice
+
config BR2_PACKAGE_PROVIDES_LIBEGL
default "gpu-viv-bin-mx6q"
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 eb54b80..7895023 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
@@ -21,7 +21,7 @@ GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
# DirectFB is not supported (wrong version)
-ifeq ($(BR2_PACKAGE_XORG7),y)
+ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)
GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext
GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
else
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 04/15] gpu-viv-bin-mx6q: remove useless build time deps
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (2 preceding siblings ...)
2015-01-16 23:33 ` [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:32 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 05/15] gpu-viv-bin-mx6q: add version in libraries symlinks Jérôme Pouiller
` (11 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Since gpu-viv-bin-mx6q is provided as binary package, there is no build
time dependencies.
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 4 ++--
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 0947f17..7fbddbf 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -32,8 +32,8 @@ choice
config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
depends on BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXDAMAGE
- select BR2_PACKAGE_XLIB_LIBXEXT
+ select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency
+ select BR2_PACKAGE_XLIB_LIBXEXT # Runtime dependency
bool "X11"
comment "X11 backend needs Xorg package"
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 7895023..35ba1c6 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
@@ -22,7 +22,6 @@ GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
# DirectFB is not supported (wrong version)
ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)
-GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext
GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
else
GPU_VIV_BIN_MX6Q_LIB_TARGET = fb
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 05/15] gpu-viv-bin-mx6q: add version in libraries symlinks
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (3 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 04/15] gpu-viv-bin-mx6q: remove useless build time deps Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:37 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 06/15] gpu-viv-bin-mx6q: change output selection mechanism Jérôme Pouiller
` (10 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Create libraries symbolic links with version numbers.
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
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 35ba1c6..7845a25 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
@@ -36,13 +36,17 @@ endef
# Make sure these commands are idempotent.
define GPU_VIV_BIN_MX6Q_BUILD_CMDS
$(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/usr/include/*/*.h
- for lib in EGL GAL VIVANTE GLESv2; do \
- ln -sf lib$${lib}-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so \
- $(@D)/usr/lib/lib$${lib}.so; \
- done
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
endef
define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 06/15] gpu-viv-bin-mx6q: change output selection mechanism
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (4 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 05/15] gpu-viv-bin-mx6q: add version in libraries symlinks Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:40 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 07/15] xdriver_xf86-video-imx-viv: new package Jérôme Pouiller
` (9 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Move output selection to Config.in. It easier to add new backends selection
(wayland, directfb, ...).
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 5 +++++
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 8 +-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 7fbddbf..2392d9a 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -44,6 +44,11 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
endchoice
+config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT
+ string
+ default "x11" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
+ default "fb" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
+
config BR2_PACKAGE_PROVIDES_LIBEGL
default "gpu-viv-bin-mx6q"
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 7845a25..501b124 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
@@ -19,13 +19,7 @@ GPU_VIV_BIN_MX6Q_LICENSE_FILES = EULA
GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
-
-# DirectFB is not supported (wrong version)
-ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)
-GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
-else
-GPU_VIV_BIN_MX6Q_LIB_TARGET = fb
-endif
+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))
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 07/15] xdriver_xf86-video-imx-viv: new package
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (5 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 06/15] gpu-viv-bin-mx6q: change output selection mechanism Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:46 ` [Buildroot] [v6,07/15] " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 08/15] qt5base: apply new patch naming policy Jérôme Pouiller
` (8 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Xorg driver for imx6. Inspired from Yocto project.
I did not find any problem, but notice Yocto project force Xorg xserver
1.14.4 while we use 1.16.
Notice Vivante driver should be able to provide Desktop OpenGL implementation.
However, this feature seems broken for a while[1]. Yocto use Mesa3D/swraster
to provide Desktop OpenGL API[2].
[1] http://comments.gmane.org/gmane.linux.embedded.yocto.meta-freescale/8253
[2] See recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.17-1.0.1.bb
in meta-fsl-arm layer
Tested with:
subsequent qt5base and libdrm fixes +
QMX6 board +
BR2_ARM_EABIHF= both tested
BR2_ARM_ENABLE_NEON=y
BR2_ARM_FPU_NEON=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
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"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9bafbcba67f7bb2a48a5e05998cecb1165aa444f"
BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6"
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_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES=y
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/x11r7/Config.in | 1 +
.../0001-Fix-LoadExtenions.patch | 15 ++++++++++
package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 31 ++++++++++++++++++++
.../xdriver_xf86-video-imx-viv.mk | 33 ++++++++++++++++++++++
4 files changed, 80 insertions(+)
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/Config.in
create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2fd1ff0..5480d9a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -160,6 +160,7 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xdriver_xf86-video-glide/Config.in
source package/x11r7/xdriver_xf86-video-glint/Config.in
source package/x11r7/xdriver_xf86-video-i128/Config.in
+ source package/x11r7/xdriver_xf86-video-imx-viv/Config.in
source package/x11r7/xdriver_xf86-video-intel/Config.in
source package/x11r7/xdriver_xf86-video-mach64/Config.in
source package/x11r7/xdriver_xf86-video-mga/Config.in
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
new file mode 100644
index 0000000..3e2d47c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
@@ -0,0 +1,15 @@
+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/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
new file mode 100644
index 0000000..8926a50
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
@@ -0,0 +1,31 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
+ bool "xf86-video-imx-viv"
+ depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q_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
+ select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+ help
+ X.Org driver for iMX6 GPU (Vivante)
+
+ Notice EGL and GLes2 APIs are correctly supported. This driver should
+ also be able to provide Desktop OpenGL implementation but, this
+ feature seems broken since quite some time.
+
+ To use this driver, add correct configuration to your
+ /etc/X11/xorg.conf:
+
+ Section "Device"
+ [...]
+ Driver "vivante"
+ Option "vivante_fbdev" "/dev/fbX"
+ EndSection
+
+ Don't forget to load galcore.ko and create /dev/galcore before using
+ 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"
+ depends on BR2_arm
+ depends on !BR2_PACKAGE_GPU_VIV_BIN_MX6Q_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
new file mode 100644
index 0000000..44d98d5
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# xdriver_xf86-video-imx-viv
+#
+################################################################################
+
+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 = gpu-viv-bin-mx6q xserver_xorg-server \
+ xproto_xproto xproto_xf86driproto libdrm
+XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = GPLv2
+XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES
+XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/EXA/src -f makefile.linux
+
+define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS
+ $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \
+ BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \
+ CFLAGS="$(TARGET_CFLAGS) -I$(@D)/DRI_1.10.4/src"
+endef
+
+define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS
+ $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(STAGING_DIR)/usr install
+ $(INSTALL) -m 644 $(@D)/EXA/src/vivante_gal/vivante_priv.h $(STAGING_DIR)/usr/include
+ $(INSTALL) -m 644 $(@D)/EXA/src/vivante_gal/vivante_gal.h $(STAGING_DIR)/usr/include
+endef
+
+define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS
+ $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(TARGET_DIR)/usr install
+endef
+
+$(eval $(generic-package))
+
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 08/15] qt5base: apply new patch naming policy
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (6 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 07/15] xdriver_xf86-video-imx-viv: new package Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:47 ` [Buildroot] [v6,08/15] " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 09/15] qt5base: fix compilation with Vivante headers Jérôme Pouiller
` (7 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
.../{qt5base-0002-mkspecs-files.patch => 0002-mkspecs-files.patch} | 0
.../{qt5base-0003-uclibc-no-lfs.patch => 0003-uclibc-no-lfs.patch} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename package/qt5/qt5base/{qt5base-0002-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{qt5base-0003-uclibc-no-lfs.patch => 0003-uclibc-no-lfs.patch} (100%)
diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/0002-mkspecs-files.patch
similarity index 100%
rename from package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
rename to package/qt5/qt5base/0002-mkspecs-files.patch
diff --git a/package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch b/package/qt5/qt5base/0003-uclibc-no-lfs.patch
similarity index 100%
rename from package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch
rename to package/qt5/qt5base/0003-uclibc-no-lfs.patch
--
1.9.1
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 09/15] qt5base: fix compilation with Vivante headers.
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (7 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 08/15] qt5base: apply new patch naming policy Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:52 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 10/15] qt5base: fix "Unable to find an X11 visual" error Jérôme Pouiller
` (6 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/qt5/qt5base/0004-xcb-egl-fixes.patch | 63 ++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 package/qt5/qt5base/0004-xcb-egl-fixes.patch
diff --git a/package/qt5/qt5base/0004-xcb-egl-fixes.patch b/package/qt5/qt5base/0004-xcb-egl-fixes.patch
new file mode 100644
index 0000000..2bbd849
--- /dev/null
+++ b/package/qt5/qt5base/0004-xcb-egl-fixes.patch
@@ -0,0 +1,63 @@
+The vivante headers pull in X11 defines which break eglconvenience
+
+* Adds a missing include to qeglplatformcontext.cpp
+* Fix namespace collision on CursorShape, pulled in from X11/X.h
+* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
+
+[based on patch from Yocto project]
+Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
+
+
+diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
+--- a/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:54:52.874278651 -0400
+@@ -30,8 +30,10 @@
+ }
+ }
+
+- # Avoid X11 header collision
+- DEFINES += MESA_EGL_NO_X11_HEADERS
++ !contains(QT_CONFIG,xcb) {
++ # Avoid X11 header collision
++ DEFINES += MESA_EGL_NO_X11_HEADERS
++ }
+
+ contains(QT_CONFIG,xlib) {
+ HEADERS += \
+diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:56:00.630280249 -0400
+@@ -39,6 +39,7 @@
+ **
+ ****************************************************************************/
+
++#include <qtextstream.h>
+ #include "qeglplatformcontext_p.h"
+ #include "qeglconvenience_p.h"
+ #include "qeglpbuffer_p.h"
+--- a/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:58:49.014284222 -0400
+@@ -42,6 +42,11 @@
+ #ifndef QEGLPLATFORMCURSOR_H
+ #define QEGLPLATFORMCURSOR_H
+
++// avoid namespace collision with X11/X.h
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ #include <qpa/qplatformcursor.h>
+ #include <qpa/qplatformscreen.h>
+
+--- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400
+@@ -49,8 +49,8 @@
+
+ #include <QtPlatformSupport/private/qdevicediscovery_p.h>
+
+-#include "qeglplatformcursor_p.h"
+ #include "qeglplatformintegration_p.h"
++#include "qeglplatformcursor_p.h"
+
+ QT_BEGIN_NAMESPACE
+
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 10/15] qt5base: fix "Unable to find an X11 visual" error
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (8 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 09/15] qt5base: fix compilation with Vivante headers Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:55 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 11/15] Vivante drivers: bump to version 3.10.17-1.0.1 Jérôme Pouiller
` (5 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Fix "Unable to find an X11 visual" bug that produce at runtime with Vivante
drivers. Add a conditionnal patch and add variable QT5BASE_EXTRA_CFLAGS in
order to enable workaround.
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
.../qt5/qt5base/0001-Force_egl_visual_ID_33.patch | 26 ++++++++++++++++++++++
package/qt5/qt5base/qt5base.mk | 6 +++--
2 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
diff --git a/package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch b/package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
new file mode 100644
index 0000000..e7e6c5e
--- /dev/null
+++ b/package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
@@ -0,0 +1,26 @@
+Workaround EGL initialization failure due visual mismatch
+
+Error:
+
+Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
+Unable to find an X11 visual which matches EGL config 28
+Could not initialize EGL
+Aborted
+
+Upstream-Status: Inappropriate [workaround]
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
+--- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800
++++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800
+@@ -180,5 +180,9 @@
+ }
+
+ qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
++#ifdef ENABLE_MX6_WORKAROUND
++ return (VisualID)33;
++#else
+ return (VisualID)0;
++#endif
+ }
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index a36359d..4796785 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -172,6 +172,8 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
+QT5BASE_EXTRA_CFLAGS = $(if $(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),-DENABLE_MX6_WORKAROUND)
+
define QT5BASE_CONFIGURE_CMDS
(cd $(@D); \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
@@ -192,8 +194,8 @@ define QT5BASE_CONFIGURE_CMDS
-device buildroot \
-device-option CROSS_COMPILE="$(TARGET_CROSS)" \
-device-option BR_CCACHE="$(CCACHE)" \
- -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \
- -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \
+ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)$(QT5BASE_EXTRA_CFLAGS)" \
+ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)$(QT5BASE_EXTRA_CFLAGS)" \
-device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \
-no-c++11 \
$(QT5BASE_CONFIGURE_OPTS) \
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 11/15] Vivante drivers: bump to version 3.10.17-1.0.1
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (9 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 10/15] qt5base: fix "Unable to find an X11 visual" error Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:57 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 12/15] nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga Jérôme Pouiller
` (4 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 5 +++--
.../x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
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 501b124..e07e5ca 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,10 +4,11 @@
#
################################################################################
+GPU_VIV_BIN_MX6Q_BASE_VERSION = 3.10.17-1.0.1
ifeq ($(BR2_ARM_EABIHF),y)
-GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp
+GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-hfp
else
-GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp
+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
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 44d98d5..eab7edf 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 = $(FREESCALE_IMX_VERSION)
+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 \
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 12/15] nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (10 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 11/15] Vivante drivers: bump to version 3.10.17-1.0.1 Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 8:58 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 13/15] freescale_imx6*_defconfig: " Jérôme Pouiller
` (3 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
configs/nitrogen6x_defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
index e56bd60..d75f780 100644
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@@ -26,7 +26,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-bo
# kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/898627a/linux-imx6-898627a.tar.gz"
+# 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"
BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 13/15] freescale_imx6*_defconfig: bump kernel to 3.10.17_1.0.1_ga
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (11 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 12/15] nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 9:00 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 14/15] qmx6_defconfig: update Jérôme Pouiller
` (2 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
configs/freescale_imx6dlsabresd_defconfig | 3 ++-
configs/freescale_imx6qsabresd_defconfig | 3 ++-
configs/freescale_imx6sololiteevk_defconfig | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig
index 680031d..b4f0d74 100644
--- a/configs/freescale_imx6dlsabresd_defconfig
+++ b/configs/freescale_imx6dlsabresd_defconfig
@@ -17,7 +17,8 @@ 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"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+# Last version of branch imx_3.10.17_1.0.1_ga
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig
index f2f702e..9ca89cb 100644
--- a/configs/freescale_imx6qsabresd_defconfig
+++ b/configs/freescale_imx6qsabresd_defconfig
@@ -17,7 +17,8 @@ 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"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+# Last version of branch imx_3.10.17_1.0.1_ga
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig
index f8ecc7b..f501fc3 100644
--- a/configs/freescale_imx6sololiteevk_defconfig
+++ b/configs/freescale_imx6sololiteevk_defconfig
@@ -9,7 +9,8 @@ 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"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
+# Last version of branch imx_3.10.17_1.0.1_ga
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 14/15] qmx6_defconfig: update
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (12 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 13/15] freescale_imx6*_defconfig: " Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 9:02 ` [Buildroot] [v6,14/15] " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 15/15] qmx6_qt5_demo_defconfig: new defconfig Jérôme Pouiller
2015-01-22 6:47 ` [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Gary Bisson
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
- Update kernel
- Add u-boot configuration
- 6q_bootscript.txt is no more needed by new version of u-boot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
board/congatec/qmx6/6q_bootscript.txt | 2 --
board/congatec/qmx6/post-build.sh | 7 -------
configs/qmx6_defconfig | 25 +++++++++++++++++++++----
3 files changed, 21 insertions(+), 13 deletions(-)
delete mode 100644 board/congatec/qmx6/6q_bootscript.txt
delete mode 100755 board/congatec/qmx6/post-build.sh
diff --git a/board/congatec/qmx6/6q_bootscript.txt b/board/congatec/qmx6/6q_bootscript.txt
deleted file mode 100644
index 1382220..0000000
--- a/board/congatec/qmx6/6q_bootscript.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-set bootargs console=ttymxc1,115200 root=/dev/mmcblk0p1 rootwait consoleblank=0
-${fs}load mmc ${disk}:1 10800000 /boot/uImage && bootm 10800000 ; echo "Error loading kernel image"
diff --git a/board/congatec/qmx6/post-build.sh b/board/congatec/qmx6/post-build.sh
deleted file mode 100755
index 92251a5..0000000
--- a/board/congatec/qmx6/post-build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-TARGET_DIR=$1
-BOARD_DIR="$(dirname $0)"
-
-mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot script" \
- -d $BOARD_DIR/6q_bootscript.txt $TARGET_DIR/6q_bootscript
diff --git a/configs/qmx6_defconfig b/configs/qmx6_defconfig
index 143e058..ff035a9 100644
--- a/configs/qmx6_defconfig
+++ b/configs/qmx6_defconfig
@@ -1,16 +1,33 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.0.101"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y
+BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/congatec/qmx6/post-build.sh"
+
+# Notice you need a recent version of u-boot (with DT support) to be able
+# to boot this kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.0.35_4.1.0_QMX6_R1.1.2"
+# Last version of branch cgt_imx_3.10.17_1.0.0
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9bafbcba67f7bb2a48a5e05998cecb1165aa444f"
BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+# Change boardname depending of your product number
+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_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx"
+
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_3=y
+
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 15/15] qmx6_qt5_demo_defconfig: new defconfig
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (13 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 14/15] qmx6_defconfig: update Jérôme Pouiller
@ 2015-01-16 23:34 ` Jérôme Pouiller
2015-04-30 9:03 ` [Buildroot] [v6,15/15] " Gary Bisson
2015-01-22 6:47 ` [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Gary Bisson
15 siblings, 1 reply; 37+ messages in thread
From: Jérôme Pouiller @ 2015-01-16 23:34 UTC (permalink / raw)
To: buildroot
This new defconfig is based on qmx6_defconfig. In add:
- it enable support for graphical drivers
- it enable Qt5 (eglfs)
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
configs/qmx6_qt5_demo_defconfig | 57 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 configs/qmx6_qt5_demo_defconfig
diff --git a/configs/qmx6_qt5_demo_defconfig b/configs/qmx6_qt5_demo_defconfig
new file mode 100644
index 0000000..22c6e15
--- /dev/null
+++ b/configs/qmx6_qt5_demo_defconfig
@@ -0,0 +1,57 @@
+# architecture
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10.17"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+BR2_TOOLCHAIN_BUILDROOT_EGLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+# system
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
+
+# kernel
+# Notice you need a recent version of u-boot (with DT support) to be able
+# to boot this kernel
+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"
+BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+# Graphics drivers
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
+BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
+BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB=y
+
+# Enable Qt5
+BR2_PACKAGE_QT5=y
+BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
+BR2_PACKAGE_QT5BASE_GUI=y
+BR2_PACKAGE_QT5BASE_EGLFS=y
+BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
+BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
+BR2_PACKAGE_QT5BASE_PNG=y
+
+# u-boot
+# Change boardname depending of your product number
+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_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx"
+
+# Images
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_3=y
+
+# Usefull host packages
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium
2015-01-16 23:33 ` [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium Jérôme Pouiller
@ 2015-01-17 17:02 ` Bernd Kuhls
2015-04-30 8:16 ` [Buildroot] [v6, " Gary Bisson
1 sibling, 0 replies; 37+ messages in thread
From: Bernd Kuhls @ 2015-01-17 17:02 UTC (permalink / raw)
To: buildroot
=?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <jezz-
kPcTzGkeZgAdnm+yROfE0A@public.gmane.org> wrote in news:1421451251-23366-2-
git-send-email-jezz at sysmic.org:
> Signed-off-by: J??r??me Pouiller <jezz@sysmic.org>
> ---
> package/mesa3d/mesa3d.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index f6f6b0f..e96bba6 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -64,7 +64,7 @@ MESA3D_DRI_DRIVERS-$(BR2
_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
> MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
> MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
>
> -ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
> +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
> MESA3D_CONF_OPTS += \
> --without-gallium-drivers
> else
> @@ -73,7 +73,7 @@ MESA3D_CONF_OPTS += \
> --with-gallium-drivers=$(subst $(space),$(comma),
$(MESA3D_GALLIUM_DRIVERS-y))
> endif
>
> -ifeq ($(MESA3D_DRI_DRIVERS-y),)
> +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
> MESA3D_CONF_OPTS += \
> --without-dri-drivers --without-dri --disable-dri3
> else
> --
> 1.9.1
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> Attachment decoded: untitled-1.txt
>
Hi,
I only looked at this patch alone since I have no freescale hardware to
test with. Compiling mesa3d with this patch included using this defconfig
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER=y
BR2_PACKAGE_MESA3D_DRI_DRIVER=y
BR2_PACKAGE_MESA3D_DRIVER=y
does not break despite providing empty values in these configure options
--with-gallium-drivers=
--with-dri-drivers=
so
Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Regards, Bernd
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
` (14 preceding siblings ...)
2015-01-16 23:34 ` [Buildroot] [PATCH v6 15/15] qmx6_qt5_demo_defconfig: new defconfig Jérôme Pouiller
@ 2015-01-22 6:47 ` Gary Bisson
2015-04-09 16:03 ` Gary Bisson
15 siblings, 1 reply; 37+ messages in thread
From: Gary Bisson @ 2015-01-22 6:47 UTC (permalink / raw)
To: buildroot
Hi Jerome,
On Fri, Jan 16, 2015 at 3:33 PM, J?r?me Pouiller <jezz@sysmic.org> wrote:
> Hello,
>
> Main purpose of this serie is to add support of Vivante GPU (found on imx6) to
> Xorg. This work is mainly adapted from Yocto.
>
> v6:
> - Rebase on master
> - Add license for xdriver_xf86-video-imx-viv. Notice this package does not
> provide any license file.
> - Fix typos suggested by Thomas P.
> - Fix dependency on libdrm (gpu-viv-bin-mx6q does not depends on libdrm, but
> xdriver_xf86-video-imx-viv does depend)
> - Add a note about runtime dependencies in gpu-viv-bin-mx6q
> - Splited patch 6/15 in 3 parts
> - Splited patch 10/15 in 2 parts
> - Make 0001-Force_egl_visual_ID_33.patch contionnal
>
I confirm this patchset applies and builds fine on master. However I
couldn't get X to start properly as it was complaining that no screen
was available (using the same setup as before: nitrogen6x + HDMI
monitor). I didn't have time to investigate any further but have you
had any issue? I think the X server version has been bumped lately,
are you still using the same xorg.conf?
I'll try to get more info before the end of the week.
Thanks,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6
2015-01-22 6:47 ` [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Gary Bisson
@ 2015-04-09 16:03 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-09 16:03 UTC (permalink / raw)
To: buildroot
Hi Jerome,
On 01/22/2015 07:47 AM, Gary Bisson wrote:
> Hi Jerome,
>
> On Fri, Jan 16, 2015 at 3:33 PM, J?r?me Pouiller <jezz@sysmic.org> wrote:
>> Hello,
>>
>> Main purpose of this serie is to add support of Vivante GPU (found on imx6) to
>> Xorg. This work is mainly adapted from Yocto.
>>
>> v6:
>> - Rebase on master
>> - Add license for xdriver_xf86-video-imx-viv. Notice this package does not
>> provide any license file.
>> - Fix typos suggested by Thomas P.
>> - Fix dependency on libdrm (gpu-viv-bin-mx6q does not depends on libdrm, but
>> xdriver_xf86-video-imx-viv does depend)
>> - Add a note about runtime dependencies in gpu-viv-bin-mx6q
>> - Splited patch 6/15 in 3 parts
>> - Splited patch 10/15 in 2 parts
>> - Make 0001-Force_egl_visual_ID_33.patch contionnal
>>
>
> I confirm this patchset applies and builds fine on master. However I
> couldn't get X to start properly as it was complaining that no screen
> was available (using the same setup as before: nitrogen6x + HDMI
> monitor). I didn't have time to investigate any further but have you
> had any issue? I think the X server version has been bumped lately,
> are you still using the same xorg.conf?
> I'll try to get more info before the end of the week.
I guess you must feel desperate about this patchset getting into
mainline and I'm sorry not to have looked at it for months.
Anyway, I got some time today and built everything from scratch again
using the configuration you suggest in you 7/15 but for my board
(nitrogen6x kernel and u-boot config).
First of all, everything applies and builds fine on today's master. Then
everything I've tested is working fine:
- X (starting the X server with the xorg.conf from Yocto):
https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
- GPU libs with X back-end (test of turorial7). Plus I made sure
building with fb back-end still works fine
- Qt5 with openGl, as I didn't what was the best test I've started a few
binaries:
# /usr/lib/qt/examples/opengl/hellogl2/hellogl2
# /usr/lib/qt/examples/gui/openglwindow/openglwindow
# qmlscene TestCase.qml
In other words, everything runs great!
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium
2015-01-16 23:33 ` [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium Jérôme Pouiller
2015-01-17 17:02 ` Bernd Kuhls
@ 2015-04-30 8:16 ` Gary Bisson
2015-04-30 8:26 ` Thomas Petazzoni
1 sibling, 1 reply; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:16 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:33:57AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/mesa3d/mesa3d.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index f6f6b0f..e96bba6 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -64,7 +64,7 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
> MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
> MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
>
> -ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
> +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
> MESA3D_CONF_OPTS += \
> --without-gallium-drivers
> else
> @@ -73,7 +73,7 @@ MESA3D_CONF_OPTS += \
> --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
> endif
>
> -ifeq ($(MESA3D_DRI_DRIVERS-y),)
> +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
> MESA3D_CONF_OPTS += \
> --without-dri-drivers --without-dri --disable-dri3
> else
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB
2015-01-16 23:33 ` [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB Jérôme Pouiller
@ 2015-04-30 8:21 ` Gary Bisson
2015-04-30 8:30 ` [Buildroot] [PATCH v6 " Thomas Petazzoni
1 sibling, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:21 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:33:58AM +0100, J?r?me Pouiller wrote:
> To compile with Vivante header and use framebuffer, it is necessary to
> pass option -DEGL_API_FB. This option is declared in pkg-config file of
> Vivante library. But many packages (especialy qt5 components) does not
> consider these flags.
>
> So instead of patching every packages that use EGL, it is more
> convenient to patch Vivante headers.
>
> This commit add #define EGL_API_FB on top of eglvivante.h when
> necessary.
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/gpu-viv-bin-mx6q/egl.pc | 2 +-
> package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc | 2 +-
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 10 ++++++----
> package/freescale-imx/gpu-viv-bin-mx6q/vg.pc | 2 +-
> 4 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
> index c984247..d1d09a0 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/egl.pc
> @@ -7,4 +7,4 @@ Name: egl
> Description: Freescale gpu-viv-bin-mx6q implementation of EGL
> Version: 1.0
> Libs: -L${libdir} -lGAL -lEGL
> -Cflags: -I${includedir}/ -DEGL_API_FB=1
> +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
> index 7cfb5e7..74ce792 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/glesv2.pc
> @@ -7,4 +7,4 @@ Name: glesv2
> Description: Freescale gpu-viv-bin-mx6q implementation of OpenGL ESv2
> Version: 2.0
> Libs: -L${libdir} -lGAL -lEGL -lGLESv2
> -Cflags: -I${includedir}/ -DEGL_API_FB=1
> +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 79c7a92..eb54b80 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
> @@ -48,14 +48,16 @@ endef
>
> define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
> cp -r $(@D)/usr/* $(STAGING_DIR)/usr
> + if [ $(GPU_VIV_BIN_MX6Q_LIB_TARGET) == fb ]; then \
> + $(SED) '/#define EGLAPIENTRY/ a \
> + #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; \
> + fi
> for lib in egl glesv2 vg; do \
> $(INSTALL) -m 0644 -D \
> package/freescale-imx/gpu-viv-bin-mx6q/$${lib}.pc \
> $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
> - if [ "$(GPU_VIV_BIN_MX6Q_LIB_TARGET)" != "fb" ]; then \
> - $(SED) "s/-DEGL_API_FB=1//" \
> - $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
> - fi; \
> done
> endef
>
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
> index fb14005..677a7ee 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/vg.pc
> @@ -7,4 +7,4 @@ Name: vg
> Description: Freescale gpu-viv-bin-mx6q implementation of OpenVG
> Version: 1.1
> Libs: -L${libdir} -lGAL -lEGL -lOpenVG
> -Cflags: -I${includedir}/ -DEGL_API_FB=1
> +Cflags: -I${includedir}/
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium
2015-04-30 8:16 ` [Buildroot] [v6, " Gary Bisson
@ 2015-04-30 8:26 ` Thomas Petazzoni
0 siblings, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2015-04-30 8:26 UTC (permalink / raw)
To: buildroot
Dear Gary Bisson,
On Thu, 30 Apr 2015 10:16:18 +0200, Gary Bisson wrote:
> As explained in my answer to the cover letter, this series of patch has
> been successfully tested on a Nitrogen6x board.
> http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
>
> Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Thanks. Could you, or J?r?me provide a more detailed (i.e non-empty)
commit log for this commit? What's happening is not that trivial, but
the commit log is empty.
No need to resend the patch, just provide in a mail a better commit
log, and Peter or I will integrate the new commit log when applying the
patch.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit
2015-01-16 23:33 ` [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit Jérôme Pouiller
@ 2015-04-30 8:29 ` Gary Bisson
2015-04-30 8:31 ` [Buildroot] [PATCH v6 " Thomas Petazzoni
1 sibling, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:29 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:33:59AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 23 ++++++++++++++++++++--
> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 2 +-
> 2 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> index 4e83dd3..0947f17 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> @@ -7,8 +7,6 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
> select BR2_PACKAGE_HAS_LIBEGL
> select BR2_PACKAGE_HAS_LIBGLES
> select BR2_PACKAGE_HAS_LIBOPENVG
> - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
> - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
> depends on BR2_arm # Only relevant for i.MX6
> # Library binaries are linked against libc.so.6
> depends on BR2_TOOLCHAIN_USES_GLIBC
> @@ -25,6 +23,27 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q
>
> if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
>
> +choice
> + prompt "Output option"
> + help
> + There are two versions of this library: one for
> + direct framebuffer access, one for X11 rendering.
> + Choose here which version to install.
> +
> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
> + depends on BR2_PACKAGE_XORG7
> + select BR2_PACKAGE_XLIB_LIBXDAMAGE
> + select BR2_PACKAGE_XLIB_LIBXEXT
> + bool "X11"
> +
> +comment "X11 backend needs Xorg package"
> + depends on !BR2_PACKAGE_XORG7
> +
> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
> + bool "Framebuffer"
> +
> +endchoice
> +
> config BR2_PACKAGE_PROVIDES_LIBEGL
> default "gpu-viv-bin-mx6q"
>
> 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 eb54b80..7895023 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
> @@ -21,7 +21,7 @@ GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
> GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
>
> # DirectFB is not supported (wrong version)
> -ifeq ($(BR2_PACKAGE_XORG7),y)
> +ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)
> GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext
> GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
> else
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Also, this change has been discussed earlier as for the reason to be
able to have fb libs in a X-based system and people seemed interested.
Therefore this approach is more flexible than what was present before.
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB
2015-01-16 23:33 ` [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB Jérôme Pouiller
2015-04-30 8:21 ` [Buildroot] [v6, " Gary Bisson
@ 2015-04-30 8:30 ` Thomas Petazzoni
1 sibling, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2015-04-30 8:30 UTC (permalink / raw)
To: buildroot
Dear J?r?me Pouiller,
On Sat, 17 Jan 2015 00:33:58 +0100, J?r?me Pouiller wrote:
> define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
> cp -r $(@D)/usr/* $(STAGING_DIR)/usr
> + if [ $(GPU_VIV_BIN_MX6Q_LIB_TARGET) == fb ]; then \
> + $(SED) '/#define EGLAPIENTRY/ a \
> + #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; \
> + fi
This should have used a make test instead of a shell test, i.e:
ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb)
define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS
$(SED) '/#define EGLAPIENTRY/ a \
#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)/usr/* $(STAGING_DIR)/usr
$(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS)
endef
Can be fixed up when applying the patch.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit
2015-01-16 23:33 ` [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit Jérôme Pouiller
2015-04-30 8:29 ` [Buildroot] [v6, " Gary Bisson
@ 2015-04-30 8:31 ` Thomas Petazzoni
1 sibling, 0 replies; 37+ messages in thread
From: Thomas Petazzoni @ 2015-04-30 8:31 UTC (permalink / raw)
To: buildroot
Dear J?r?me Pouiller,
On Sat, 17 Jan 2015 00:33:59 +0100, J?r?me Pouiller wrote:
> +choice
> + prompt "Output option"
> + help
> + There are two versions of this library: one for
> + direct framebuffer access, one for X11 rendering.
> + Choose here which version to install.
> +
> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
> + depends on BR2_PACKAGE_XORG7
> + select BR2_PACKAGE_XLIB_LIBXDAMAGE
> + select BR2_PACKAGE_XLIB_LIBXEXT
> + bool "X11"
The bool should have been the first property, before depends on and
select properties.
I guess we'll fix up when applying since it is a minor thing.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 04/15] gpu-viv-bin-mx6q: remove useless build time deps
2015-01-16 23:34 ` [Buildroot] [PATCH v6 04/15] gpu-viv-bin-mx6q: remove useless build time deps Jérôme Pouiller
@ 2015-04-30 8:32 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:32 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:00AM +0100, J?r?me Pouiller wrote:
> Since gpu-viv-bin-mx6q is provided as binary package, there is no build
> time dependencies.
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 4 ++--
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> index 0947f17..7fbddbf 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> @@ -32,8 +32,8 @@ choice
>
> config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
> depends on BR2_PACKAGE_XORG7
> - select BR2_PACKAGE_XLIB_LIBXDAMAGE
> - select BR2_PACKAGE_XLIB_LIBXEXT
> + select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency
> + select BR2_PACKAGE_XLIB_LIBXEXT # Runtime dependency
> bool "X11"
>
> comment "X11 backend needs Xorg package"
> 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 7895023..35ba1c6 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
> @@ -22,7 +22,6 @@ GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
>
> # DirectFB is not supported (wrong version)
> ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)
> -GPU_VIV_BIN_MX6Q_DEPENDENCIES = xlib_libXdamage xlib_libXext
> GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
> else
> GPU_VIV_BIN_MX6Q_LIB_TARGET = fb
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Also, those dependencies clearly shouldn't exist.
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 05/15] gpu-viv-bin-mx6q: add version in libraries symlinks
2015-01-16 23:34 ` [Buildroot] [PATCH v6 05/15] gpu-viv-bin-mx6q: add version in libraries symlinks Jérôme Pouiller
@ 2015-04-30 8:37 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:37 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:01AM +0100, J?r?me Pouiller wrote:
> Create libraries symbolic links with version numbers.
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> 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 35ba1c6..7845a25 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
> @@ -36,13 +36,17 @@ endef
> # Make sure these commands are idempotent.
> define GPU_VIV_BIN_MX6Q_BUILD_CMDS
> $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/usr/include/*/*.h
> - for lib in EGL GAL VIVANTE GLESv2; do \
> - ln -sf lib$${lib}-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so \
> - $(@D)/usr/lib/lib$${lib}.so; \
> - done
> 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
> endef
>
> define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
This now matches what is done in Yocto:
https://github.com/Freescale/meta-fsl-arm/blob/dizzy/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc#L165
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 06/15] gpu-viv-bin-mx6q: change output selection mechanism
2015-01-16 23:34 ` [Buildroot] [PATCH v6 06/15] gpu-viv-bin-mx6q: change output selection mechanism Jérôme Pouiller
@ 2015-04-30 8:40 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:40 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:02AM +0100, J?r?me Pouiller wrote:
> Move output selection to Config.in. It easier to add new backends selection
> (wayland, directfb, ...).
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 5 +++++
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 8 +-------
> 2 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> index 7fbddbf..2392d9a 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
> @@ -44,6 +44,11 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
>
> endchoice
>
> +config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT
> + string
> + default "x11" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11
> + default "fb" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB
> +
> config BR2_PACKAGE_PROVIDES_LIBEGL
> default "gpu-viv-bin-mx6q"
>
> 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 7845a25..501b124 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
> @@ -19,13 +19,7 @@ GPU_VIV_BIN_MX6Q_LICENSE_FILES = EULA
> GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
>
> GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
> -
> -# DirectFB is not supported (wrong version)
> -ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11),y)
> -GPU_VIV_BIN_MX6Q_LIB_TARGET = x11
> -else
> -GPU_VIV_BIN_MX6Q_LIB_TARGET = fb
> -endif
> +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))
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6,07/15] xdriver_xf86-video-imx-viv: new package
2015-01-16 23:34 ` [Buildroot] [PATCH v6 07/15] xdriver_xf86-video-imx-viv: new package Jérôme Pouiller
@ 2015-04-30 8:46 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:46 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:03AM +0100, J?r?me Pouiller wrote:
> Xorg driver for imx6. Inspired from Yocto project.
>
> I did not find any problem, but notice Yocto project force Xorg xserver
> 1.14.4 while we use 1.16.
>
> Notice Vivante driver should be able to provide Desktop OpenGL implementation.
> However, this feature seems broken for a while[1]. Yocto use Mesa3D/swraster
> to provide Desktop OpenGL API[2].
>
> [1] http://comments.gmane.org/gmane.linux.embedded.yocto.meta-freescale/8253
> [2] See recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.17-1.0.1.bb
> in meta-fsl-arm layer
>
> Tested with:
> subsequent qt5base and libdrm fixes +
> QMX6 board +
> BR2_ARM_EABIHF= both tested
> BR2_ARM_ENABLE_NEON=y
> BR2_ARM_FPU_NEON=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
> 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"
> BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9bafbcba67f7bb2a48a5e05998cecb1165aa444f"
> BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
> BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6"
> 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_FREESCALE_IMX=y
> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
> BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
> BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES=y
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/x11r7/Config.in | 1 +
> .../0001-Fix-LoadExtenions.patch | 15 ++++++++++
> package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 31 ++++++++++++++++++++
> .../xdriver_xf86-video-imx-viv.mk | 33 ++++++++++++++++++++++
> 4 files changed, 80 insertions(+)
> create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
> create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/Config.in
> create mode 100644 package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
>
> diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
> index 2fd1ff0..5480d9a 100644
> --- a/package/x11r7/Config.in
> +++ b/package/x11r7/Config.in
> @@ -160,6 +160,7 @@ if BR2_PACKAGE_XORG7
> source package/x11r7/xdriver_xf86-video-glide/Config.in
> source package/x11r7/xdriver_xf86-video-glint/Config.in
> source package/x11r7/xdriver_xf86-video-i128/Config.in
> + source package/x11r7/xdriver_xf86-video-imx-viv/Config.in
> source package/x11r7/xdriver_xf86-video-intel/Config.in
> source package/x11r7/xdriver_xf86-video-mach64/Config.in
> source package/x11r7/xdriver_xf86-video-mga/Config.in
> 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
> new file mode 100644
> index 0000000..3e2d47c
> --- /dev/null
> +++ b/package/x11r7/xdriver_xf86-video-imx-viv/0001-Fix-LoadExtenions.patch
> @@ -0,0 +1,15 @@
> +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/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
> new file mode 100644
> index 0000000..8926a50
> --- /dev/null
> +++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
> @@ -0,0 +1,31 @@
> +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
> + bool "xf86-video-imx-viv"
> + depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q_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
> + select BR2_PACKAGE_XPROTO_XPROTO
> + select BR2_PACKAGE_XPROTO_XF86DRIPROTO
> + help
> + X.Org driver for iMX6 GPU (Vivante)
> +
> + Notice EGL and GLes2 APIs are correctly supported. This driver should
> + also be able to provide Desktop OpenGL implementation but, this
> + feature seems broken since quite some time.
> +
> + To use this driver, add correct configuration to your
> + /etc/X11/xorg.conf:
> +
> + Section "Device"
> + [...]
> + Driver "vivante"
> + Option "vivante_fbdev" "/dev/fbX"
> + EndSection
> +
> + Don't forget to load galcore.ko and create /dev/galcore before using
> + 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"
> + depends on BR2_arm
> + depends on !BR2_PACKAGE_GPU_VIV_BIN_MX6Q_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
> new file mode 100644
> index 0000000..44d98d5
> --- /dev/null
> +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
> @@ -0,0 +1,33 @@
> +################################################################################
> +#
> +# xdriver_xf86-video-imx-viv
> +#
> +################################################################################
> +
> +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 = gpu-viv-bin-mx6q xserver_xorg-server \
> + xproto_xproto xproto_xf86driproto libdrm
> +XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = GPLv2
> +XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES
> +XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/EXA/src -f makefile.linux
> +
> +define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS
> + $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \
> + BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \
> + CFLAGS="$(TARGET_CFLAGS) -I$(@D)/DRI_1.10.4/src"
> +endef
> +
> +define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS
> + $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(STAGING_DIR)/usr install
> + $(INSTALL) -m 644 $(@D)/EXA/src/vivante_gal/vivante_priv.h $(STAGING_DIR)/usr/include
> + $(INSTALL) -m 644 $(@D)/EXA/src/vivante_gal/vivante_gal.h $(STAGING_DIR)/usr/include
> +endef
> +
> +define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS
> + $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(TARGET_DIR)/usr install
> +endef
> +
> +$(eval $(generic-package))
> +
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
More specifically, the test was based on the configuration provided in
this commit message.
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6,08/15] qt5base: apply new patch naming policy
2015-01-16 23:34 ` [Buildroot] [PATCH v6 08/15] qt5base: apply new patch naming policy Jérôme Pouiller
@ 2015-04-30 8:47 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:47 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:04AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> .../{qt5base-0002-mkspecs-files.patch => 0002-mkspecs-files.patch} | 0
> .../{qt5base-0003-uclibc-no-lfs.patch => 0003-uclibc-no-lfs.patch} | 0
> 2 files changed, 0 insertions(+), 0 deletions(-)
> rename package/qt5/qt5base/{qt5base-0002-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
> rename package/qt5/qt5base/{qt5base-0003-uclibc-no-lfs.patch => 0003-uclibc-no-lfs.patch} (100%)
>
> diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/0002-mkspecs-files.patch
> similarity index 100%
> rename from package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
> rename to package/qt5/qt5base/0002-mkspecs-files.patch
> diff --git a/package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch b/package/qt5/qt5base/0003-uclibc-no-lfs.patch
> similarity index 100%
> rename from package/qt5/qt5base/qt5base-0003-uclibc-no-lfs.patch
> rename to package/qt5/qt5base/0003-uclibc-no-lfs.patch
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 09/15] qt5base: fix compilation with Vivante headers.
2015-01-16 23:34 ` [Buildroot] [PATCH v6 09/15] qt5base: fix compilation with Vivante headers Jérôme Pouiller
@ 2015-04-30 8:52 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:52 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:05AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/qt5/qt5base/0004-xcb-egl-fixes.patch | 63 ++++++++++++++++++++++++++++
> 1 file changed, 63 insertions(+)
> create mode 100644 package/qt5/qt5base/0004-xcb-egl-fixes.patch
>
> diff --git a/package/qt5/qt5base/0004-xcb-egl-fixes.patch b/package/qt5/qt5base/0004-xcb-egl-fixes.patch
> new file mode 100644
> index 0000000..2bbd849
> --- /dev/null
> +++ b/package/qt5/qt5base/0004-xcb-egl-fixes.patch
> @@ -0,0 +1,63 @@
> +The vivante headers pull in X11 defines which break eglconvenience
> +
> +* Adds a missing include to qeglplatformcontext.cpp
> +* Fix namespace collision on CursorShape, pulled in from X11/X.h
> +* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
> +
> +[based on patch from Yocto project]
> +Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> +
> +
> +diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
> +--- a/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:53:50.038277168 -0400
> ++++ b/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:54:52.874278651 -0400
> +@@ -30,8 +30,10 @@
> + }
> + }
> +
> +- # Avoid X11 header collision
> +- DEFINES += MESA_EGL_NO_X11_HEADERS
> ++ !contains(QT_CONFIG,xcb) {
> ++ # Avoid X11 header collision
> ++ DEFINES += MESA_EGL_NO_X11_HEADERS
> ++ }
> +
> + contains(QT_CONFIG,xlib) {
> + HEADERS += \
> +diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
> +--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:53:50.038277168 -0400
> ++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:56:00.630280249 -0400
> +@@ -39,6 +39,7 @@
> + **
> + ****************************************************************************/
> +
> ++#include <qtextstream.h>
> + #include "qeglplatformcontext_p.h"
> + #include "qeglconvenience_p.h"
> + #include "qeglpbuffer_p.h"
> +--- a/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:53:50.038277168 -0400
> ++++ b/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:58:49.014284222 -0400
> +@@ -42,6 +42,11 @@
> + #ifndef QEGLPLATFORMCURSOR_H
> + #define QEGLPLATFORMCURSOR_H
> +
> ++// avoid namespace collision with X11/X.h
> ++#ifdef CursorShape
> ++#undef CursorShape
> ++#endif
> ++
> + #include <qpa/qplatformcursor.h>
> + #include <qpa/qplatformscreen.h>
> +
> +--- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400
> ++++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400
> +@@ -49,8 +49,8 @@
> +
> + #include <QtPlatformSupport/private/qdevicediscovery_p.h>
> +
> +-#include "qeglplatformcursor_p.h"
> + #include "qeglplatformintegration_p.h"
> ++#include "qeglplatformcursor_p.h"
> +
> + QT_BEGIN_NAMESPACE
> +
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 10/15] qt5base: fix "Unable to find an X11 visual" error
2015-01-16 23:34 ` [Buildroot] [PATCH v6 10/15] qt5base: fix "Unable to find an X11 visual" error Jérôme Pouiller
@ 2015-04-30 8:55 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:55 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:06AM +0100, J?r?me Pouiller wrote:
> Fix "Unable to find an X11 visual" bug that produce at runtime with Vivante
> drivers. Add a conditionnal patch and add variable QT5BASE_EXTRA_CFLAGS in
> order to enable workaround.
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> .../qt5/qt5base/0001-Force_egl_visual_ID_33.patch | 26 ++++++++++++++++++++++
> package/qt5/qt5base/qt5base.mk | 6 +++--
> 2 files changed, 30 insertions(+), 2 deletions(-)
> create mode 100644 package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
>
> diff --git a/package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch b/package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
> new file mode 100644
> index 0000000..e7e6c5e
> --- /dev/null
> +++ b/package/qt5/qt5base/0001-Force_egl_visual_ID_33.patch
> @@ -0,0 +1,26 @@
> +Workaround EGL initialization failure due visual mismatch
> +
> +Error:
> +
> +Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
> +Unable to find an X11 visual which matches EGL config 28
> +Could not initialize EGL
> +Aborted
> +
> +Upstream-Status: Inappropriate [workaround]
> +
> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> +
> +diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
> +--- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800
> ++++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800
> +@@ -180,5 +180,9 @@
> + }
> +
> + qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
> ++#ifdef ENABLE_MX6_WORKAROUND
> ++ return (VisualID)33;
> ++#else
> + return (VisualID)0;
> ++#endif
> + }
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index a36359d..4796785 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -172,6 +172,8 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
>
> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
>
> +QT5BASE_EXTRA_CFLAGS = $(if $(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),-DENABLE_MX6_WORKAROUND)
> +
> define QT5BASE_CONFIGURE_CMDS
> (cd $(@D); \
> PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
> @@ -192,8 +194,8 @@ define QT5BASE_CONFIGURE_CMDS
> -device buildroot \
> -device-option CROSS_COMPILE="$(TARGET_CROSS)" \
> -device-option BR_CCACHE="$(CCACHE)" \
> - -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \
> - -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \
> + -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)$(QT5BASE_EXTRA_CFLAGS)" \
> + -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)$(QT5BASE_EXTRA_CFLAGS)" \
> -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \
> -no-c++11 \
> $(QT5BASE_CONFIGURE_OPTS) \
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
This patch is actually an improvement over the fix available in Yocto:
https://github.com/Freescale/meta-fsl-arm/blob/dizzy/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 11/15] Vivante drivers: bump to version 3.10.17-1.0.1
2015-01-16 23:34 ` [Buildroot] [PATCH v6 11/15] Vivante drivers: bump to version 3.10.17-1.0.1 Jérôme Pouiller
@ 2015-04-30 8:57 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:57 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:07AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 5 +++--
> .../x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 2 +-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> 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 501b124..e07e5ca 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,10 +4,11 @@
> #
> ################################################################################
>
> +GPU_VIV_BIN_MX6Q_BASE_VERSION = 3.10.17-1.0.1
> ifeq ($(BR2_ARM_EABIHF),y)
> -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp
> +GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-hfp
> else
> -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp
> +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
> 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 44d98d5..eab7edf 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 = $(FREESCALE_IMX_VERSION)
> +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 \
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Also reviewed the versioning changes at the V1 of the series.
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 12/15] nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga
2015-01-16 23:34 ` [Buildroot] [PATCH v6 12/15] nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga Jérôme Pouiller
@ 2015-04-30 8:58 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 8:58 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:08AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> configs/nitrogen6x_defconfig | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig
> index e56bd60..d75f780 100644
> --- a/configs/nitrogen6x_defconfig
> +++ b/configs/nitrogen6x_defconfig
> @@ -26,7 +26,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/u-bo
> # kernel
> BR2_LINUX_KERNEL=y
> BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
> -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://github.com/boundarydevices/linux-imx6/tarball/898627a/linux-imx6-898627a.tar.gz"
> +# 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"
> BR2_LINUX_KERNEL_DEFCONFIG="nitrogen6x"
> BR2_LINUX_KERNEL_INSTALL_TARGET=y
> BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
As explained in my answer to the cover letter, this series of patch has
been successfully tested on a Nitrogen6x board.
http://lists.busybox.net/pipermail/buildroot/2015-April/124739.html
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6, 13/15] freescale_imx6*_defconfig: bump kernel to 3.10.17_1.0.1_ga
2015-01-16 23:34 ` [Buildroot] [PATCH v6 13/15] freescale_imx6*_defconfig: " Jérôme Pouiller
@ 2015-04-30 9:00 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 9:00 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:09AM +0100, J?r?me Pouiller wrote:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> configs/freescale_imx6dlsabresd_defconfig | 3 ++-
> configs/freescale_imx6qsabresd_defconfig | 3 ++-
> configs/freescale_imx6sololiteevk_defconfig | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig
> index 680031d..b4f0d74 100644
> --- a/configs/freescale_imx6dlsabresd_defconfig
> +++ b/configs/freescale_imx6dlsabresd_defconfig
> @@ -17,7 +17,8 @@ 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"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
> +# Last version of branch imx_3.10.17_1.0.1_ga
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
> BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
> BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig
> index f2f702e..9ca89cb 100644
> --- a/configs/freescale_imx6qsabresd_defconfig
> +++ b/configs/freescale_imx6qsabresd_defconfig
> @@ -17,7 +17,8 @@ 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"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
> +# Last version of branch imx_3.10.17_1.0.1_ga
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
> BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
> BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig
> index f8ecc7b..f501fc3 100644
> --- a/configs/freescale_imx6sololiteevk_defconfig
> +++ b/configs/freescale_imx6sololiteevk_defconfig
> @@ -9,7 +9,8 @@ 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"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.10.17_1.0.0_ga"
> +# Last version of branch imx_3.10.17_1.0.1_ga
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dac46dcf913585956a0e7a838e6f4b7465f00f57"
> BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
> BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
As I do not have any SABRE board from Freescale I couldn't test those.
But the patch seems perfectly fine.
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6,14/15] qmx6_defconfig: update
2015-01-16 23:34 ` [Buildroot] [PATCH v6 14/15] qmx6_defconfig: update Jérôme Pouiller
@ 2015-04-30 9:02 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 9:02 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:10AM +0100, J?r?me Pouiller wrote:
> - Update kernel
> - Add u-boot configuration
> - 6q_bootscript.txt is no more needed by new version of u-boot
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> board/congatec/qmx6/6q_bootscript.txt | 2 --
> board/congatec/qmx6/post-build.sh | 7 -------
> configs/qmx6_defconfig | 25 +++++++++++++++++++++----
> 3 files changed, 21 insertions(+), 13 deletions(-)
> delete mode 100644 board/congatec/qmx6/6q_bootscript.txt
> delete mode 100755 board/congatec/qmx6/post-build.sh
>
> diff --git a/board/congatec/qmx6/6q_bootscript.txt b/board/congatec/qmx6/6q_bootscript.txt
> deleted file mode 100644
> index 1382220..0000000
> --- a/board/congatec/qmx6/6q_bootscript.txt
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -set bootargs console=ttymxc1,115200 root=/dev/mmcblk0p1 rootwait consoleblank=0
> -${fs}load mmc ${disk}:1 10800000 /boot/uImage && bootm 10800000 ; echo "Error loading kernel image"
> diff --git a/board/congatec/qmx6/post-build.sh b/board/congatec/qmx6/post-build.sh
> deleted file mode 100755
> index 92251a5..0000000
> --- a/board/congatec/qmx6/post-build.sh
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#!/bin/sh
> -
> -TARGET_DIR=$1
> -BOARD_DIR="$(dirname $0)"
> -
> -mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot script" \
> - -d $BOARD_DIR/6q_bootscript.txt $TARGET_DIR/6q_bootscript
> diff --git a/configs/qmx6_defconfig b/configs/qmx6_defconfig
> index 143e058..ff035a9 100644
> --- a/configs/qmx6_defconfig
> +++ b/configs/qmx6_defconfig
> @@ -1,16 +1,33 @@
> BR2_arm=y
> BR2_cortex_a9=y
> BR2_KERNEL_HEADERS_VERSION=y
> -BR2_DEFAULT_KERNEL_VERSION="3.0.101"
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y
> +BR2_DEFAULT_KERNEL_VERSION="3.10.17"
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
> BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
> -BR2_ROOTFS_POST_BUILD_SCRIPT="board/congatec/qmx6/post-build.sh"
> +
> +# Notice you need a recent version of u-boot (with DT support) to be able
> +# to boot this kernel
> BR2_LINUX_KERNEL=y
> BR2_LINUX_KERNEL_CUSTOM_GIT=y
> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_kernel.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_3.0.35_4.1.0_QMX6_R1.1.2"
> +# Last version of branch cgt_imx_3.10.17_1.0.0
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9bafbcba67f7bb2a48a5e05998cecb1165aa444f"
> BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
> +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6"
> BR2_LINUX_KERNEL_INSTALL_TARGET=y
> +
> +# Change boardname depending of your product number
> +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_FORMAT_CUSTOM=y
> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx"
> +
> BR2_TARGET_ROOTFS_EXT2=y
> BR2_TARGET_ROOTFS_EXT2_3=y
> +
> BR2_PACKAGE_HOST_UBOOT_TOOLS=y
Although I couldn't try on a Congatec board, the patch looks good and
it builds fine.
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
[build test only]
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
* [Buildroot] [v6,15/15] qmx6_qt5_demo_defconfig: new defconfig
2015-01-16 23:34 ` [Buildroot] [PATCH v6 15/15] qmx6_qt5_demo_defconfig: new defconfig Jérôme Pouiller
@ 2015-04-30 9:03 ` Gary Bisson
0 siblings, 0 replies; 37+ messages in thread
From: Gary Bisson @ 2015-04-30 9:03 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Jan 17, 2015 at 12:34:11AM +0100, J?r?me Pouiller wrote:
> This new defconfig is based on qmx6_defconfig. In add:
> - it enable support for graphical drivers
> - it enable Qt5 (eglfs)
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> configs/qmx6_qt5_demo_defconfig | 57 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
> create mode 100644 configs/qmx6_qt5_demo_defconfig
>
> diff --git a/configs/qmx6_qt5_demo_defconfig b/configs/qmx6_qt5_demo_defconfig
> new file mode 100644
> index 0000000..22c6e15
> --- /dev/null
> +++ b/configs/qmx6_qt5_demo_defconfig
> @@ -0,0 +1,57 @@
> +# architecture
> +BR2_arm=y
> +BR2_cortex_a9=y
> +BR2_KERNEL_HEADERS_VERSION=y
> +BR2_DEFAULT_KERNEL_VERSION="3.10.17"
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
> +BR2_TOOLCHAIN_BUILDROOT_EGLIBC=y
> +BR2_TOOLCHAIN_BUILDROOT_CXX=y
> +
> +# system
> +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
> +
> +# kernel
> +# Notice you need a recent version of u-boot (with DT support) to be able
> +# to boot this kernel
> +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"
> +BR2_LINUX_KERNEL_DEFCONFIG="qmx6"
> +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6"
> +BR2_LINUX_KERNEL_INSTALL_TARGET=y
> +
> +# Graphics drivers
> +BR2_PACKAGE_FREESCALE_IMX=y
> +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
> +BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
> +BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB=y
> +
> +# Enable Qt5
> +BR2_PACKAGE_QT5=y
> +BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
> +BR2_PACKAGE_QT5BASE_GUI=y
> +BR2_PACKAGE_QT5BASE_EGLFS=y
> +BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
> +BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
> +BR2_PACKAGE_QT5BASE_PNG=y
> +
> +# u-boot
> +# Change boardname depending of your product number
> +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_FORMAT_CUSTOM=y
> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx"
> +
> +# Images
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_3=y
> +
> +# Usefull host packages
> +BR2_PACKAGE_HOST_UBOOT_TOOLS=y
Although I couldn't try on a Congatec board, the patch looks good and
it builds fine.
Tested-by: Gary Bisson <gary.bisson@boundarydevices.com>
[build test only]
Regards,
Gary
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2015-04-30 9:03 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-16 23:33 [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Jérôme Pouiller
2015-01-16 23:33 ` [Buildroot] [PATCH v6 01/15] mesa3d: Give possibility to external backends to enable DRI/Gallium Jérôme Pouiller
2015-01-17 17:02 ` Bernd Kuhls
2015-04-30 8:16 ` [Buildroot] [v6, " Gary Bisson
2015-04-30 8:26 ` Thomas Petazzoni
2015-01-16 23:33 ` [Buildroot] [PATCH v6 02/15] gpu-viv-bin-mx6q: fix compiling issues with EGL_API_FB Jérôme Pouiller
2015-04-30 8:21 ` [Buildroot] [v6, " Gary Bisson
2015-04-30 8:30 ` [Buildroot] [PATCH v6 " Thomas Petazzoni
2015-01-16 23:33 ` [Buildroot] [PATCH v6 03/15] gpu-viv-bin-mx6q: make fb/x11 choice explicit Jérôme Pouiller
2015-04-30 8:29 ` [Buildroot] [v6, " Gary Bisson
2015-04-30 8:31 ` [Buildroot] [PATCH v6 " Thomas Petazzoni
2015-01-16 23:34 ` [Buildroot] [PATCH v6 04/15] gpu-viv-bin-mx6q: remove useless build time deps Jérôme Pouiller
2015-04-30 8:32 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 05/15] gpu-viv-bin-mx6q: add version in libraries symlinks Jérôme Pouiller
2015-04-30 8:37 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 06/15] gpu-viv-bin-mx6q: change output selection mechanism Jérôme Pouiller
2015-04-30 8:40 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 07/15] xdriver_xf86-video-imx-viv: new package Jérôme Pouiller
2015-04-30 8:46 ` [Buildroot] [v6,07/15] " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 08/15] qt5base: apply new patch naming policy Jérôme Pouiller
2015-04-30 8:47 ` [Buildroot] [v6,08/15] " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 09/15] qt5base: fix compilation with Vivante headers Jérôme Pouiller
2015-04-30 8:52 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 10/15] qt5base: fix "Unable to find an X11 visual" error Jérôme Pouiller
2015-04-30 8:55 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 11/15] Vivante drivers: bump to version 3.10.17-1.0.1 Jérôme Pouiller
2015-04-30 8:57 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 12/15] nitrogen6x_defconfig: bump kernel to 3.10.17_1.0.1_ga Jérôme Pouiller
2015-04-30 8:58 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 13/15] freescale_imx6*_defconfig: " Jérôme Pouiller
2015-04-30 9:00 ` [Buildroot] [v6, " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 14/15] qmx6_defconfig: update Jérôme Pouiller
2015-04-30 9:02 ` [Buildroot] [v6,14/15] " Gary Bisson
2015-01-16 23:34 ` [Buildroot] [PATCH v6 15/15] qmx6_qt5_demo_defconfig: new defconfig Jérôme Pouiller
2015-04-30 9:03 ` [Buildroot] [v6,15/15] " Gary Bisson
2015-01-22 6:47 ` [Buildroot] [PATCH v6 00/15] Add Xorg support for iMX6 Gary Bisson
2015-04-09 16:03 ` Gary Bisson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox