diff options
-rwxr-xr-x | b2qt-init-build-env | 2 | ||||
-rw-r--r-- | conf/distro/include/imx53qsb.conf | 42 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch | 26 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend | 25 | ||||
-rwxr-xr-x | scripts/setup-environment.sh | 2 |
5 files changed, 2 insertions, 95 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 6d2edcf..8447700 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -95,7 +95,7 @@ get_groups() { | |||
95 | apalis-imx6|colibri-imx6|colibri-vf) | 95 | apalis-imx6|colibri-imx6|colibri-vf) |
96 | PROJECT_GROUPS="toradex" | 96 | PROJECT_GROUPS="toradex" |
97 | ;; | 97 | ;; |
98 | imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) | 98 | imx6qsabresd|imx6dlsabresd|nitrogen6x) |
99 | PROJECT_GROUPS="fsl" | 99 | PROJECT_GROUPS="fsl" |
100 | ;; | 100 | ;; |
101 | smarc-samx6i) | 101 | smarc-samx6i) |
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf deleted file mode 100644 index 5fd52a0..0000000 --- a/conf/distro/include/imx53qsb.conf +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | include conf/distro/include/imx6.inc | ||
23 | |||
24 | DEPLOY_CONF_NAME = "Freescale iMX53 Quick Start Board" | ||
25 | |||
26 | BOOTFS_CONTENT = "\ | ||
27 | u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ | ||
28 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | ||
29 | " | ||
30 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | ||
31 | |||
32 | DISTRO_FEATURES_remove = "webengine" | ||
33 | |||
34 | MACHINE_EXTRA_INSTALL = "\ | ||
35 | amd-gpu-bin-mx51 \ | ||
36 | " | ||
37 | |||
38 | MACHINE_EXTRA_INSTALL_SDK = " \ | ||
39 | libgsl-fsl-mx51-dev \ | ||
40 | libegl-mx51-dev \ | ||
41 | libgles2-mx51-dev \ | ||
42 | " | ||
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch deleted file mode 100644 index 0a3cd76..0000000 --- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From ec1c2b5f637145e2a473820401ab96ecf0f16def Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@digia.com> | ||
3 | Date: Mon, 8 Sep 2014 10:23:46 +0300 | ||
4 | Subject: [PATCH] fix glTexImage2D API | ||
5 | |||
6 | internalformat should be GLint and not GLenum. | ||
7 | --- | ||
8 | usr/include/GLES2/gl2.h | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/usr/include/GLES2/gl2.h b/usr/include/GLES2/gl2.h | ||
12 | index c0e3a44..5aa6c26 100755 | ||
13 | --- a/usr/include/GLES2/gl2.h | ||
14 | +++ b/usr/include/GLES2/gl2.h | ||
15 | @@ -579,7 +579,7 @@ GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); | ||
16 | GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); | ||
17 | GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); | ||
18 | GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass); | ||
19 | -GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels); | ||
20 | +GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); | ||
21 | GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); | ||
22 | GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params); | ||
23 | GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); | ||
24 | -- | ||
25 | 1.8.3.2 | ||
26 | |||
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend deleted file mode 100644 index 102fbfe..0000000 --- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | ||
23 | SRC_URI += " \ | ||
24 | file://0001-fix-glTexImage2D-API.patch \ | ||
25 | " | ||
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index c3b229c..0ddd4b8 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -51,7 +51,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
51 | apalis-imx6|colibri-imx6|colibri-vf) | 51 | apalis-imx6|colibri-imx6|colibri-vf) |
52 | LAYERSCONF="bblayers.conf.toradex.sample" | 52 | LAYERSCONF="bblayers.conf.toradex.sample" |
53 | ;; | 53 | ;; |
54 | imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) | 54 | imx6qsabresd|imx6dlsabresd|nitrogen6x) |
55 | LAYERSCONF="bblayers.conf.fsl.sample" | 55 | LAYERSCONF="bblayers.conf.fsl.sample" |
56 | ;; | 56 | ;; |
57 | smarc-samx6i) | 57 | smarc-samx6i) |