summaryrefslogtreecommitdiffstats
path: root/meta-fsl-extras
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-09-23 13:04:47 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2014-09-25 15:22:26 +0300
commit01603689e8dd2d3c5be0f41d41b3543452903f03 (patch)
tree47c0d3b74c92d5891da42c48e799317a8672d253 /meta-fsl-extras
parent0dded51636b689237af7fdcda1719790c7fb3aa7 (diff)
downloadmeta-boot2qt-01603689e8dd2d3c5be0f41d41b3543452903f03.tar.gz
Move meta-fsl-arm specific files to separate layer
Create new layer for recipes and files that required only when meta-fsl-arm and meta-fsl-arm-extra layers are used. For now, the bblayers.conf template still includes the new layer as well. Change-Id: I01a0019ebaea3e1532f106e076f7608fb7aa86c6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'meta-fsl-extras')
-rw-r--r--meta-fsl-extras/conf/layer.conf33
-rw-r--r--meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend24
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc246
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch30
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch31
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch34
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc10
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc12
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc10
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc10
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend1
-rw-r--r--meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb11
-rw-r--r--meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb10
-rw-r--r--meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend42
-rw-r--r--meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend35
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch133
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend26
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch25
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch81
-rw-r--r--meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend27
27 files changed, 915 insertions, 0 deletions
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
new file mode 100644
index 0000000..5e8676d
--- /dev/null
+++ b/meta-fsl-extras/conf/layer.conf
@@ -0,0 +1,33 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23# We have a conf and classes directory, append to BBPATH
24BBPATH .= ":${LAYERDIR}"
25
26# We have a recipes directory, add to BBFILES
27BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
28 ${LAYERDIR}/recipes*/*/*.bbappend \
29 "
30
31BBFILE_COLLECTIONS += "b2qt_fsl"
32BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/"
33BBFILE_PRIORITY_b2qt_fsl = "20"
diff --git a/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
new file mode 100644
index 0000000..40075c0
--- /dev/null
+++ b/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
@@ -0,0 +1,24 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23# dependency to x11 only when distro features have it
24DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
new file mode 100644
index 0000000..f661539
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -0,0 +1,246 @@
1# Copyright (C) 2012-2013 Freescale Semiconductor
2# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
3# Released under the MIT license (see COPYING.MIT for the terms)
4
5DESCRIPTION = "GPU driver and apps for imx6"
6SECTION = "libs"
7LICENSE = "Proprietary"
8LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}"
10PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg"
11
12PE = "1"
13
14inherit fsl-eula-unpack
15
16SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
17 file://egl.pc \
18 file://egl_x11.pc \
19 file://glesv1_cm.pc \
20 file://glesv1_cm_x11.pc \
21 file://glesv2.pc \
22 file://glesv2_x11.pc \
23 file://vg.pc \
24 file://vg_x11.pc \
25 file://gc_wayland_protocol.pc \
26 file://wayland-egl.pc \
27 file://wayland-viv.pc \
28 "
29
30PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
31 libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
32 libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
33 libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
34 libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
35 libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \
36 libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \
37 libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \
38 libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \
39 libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \
40 libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \
41 libvivante-dri-mx6 \
42 libvivante-dfb-mx6 \
43 libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \
44 libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \
45 libwayland-egl-mx6-dev \
46"
47
48# Skip package if it does not match the machine float-point type in use
49python __anonymous () {
50 is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d)
51 is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp"
52
53 if is_package_hardfp != is_machine_hardfp:
54 PN = d.getVar("PN", True)
55 PV = d.getVar("PV", True)
56 bb.debug(1, "Skipping %s (%s) as machine and package float-point does not match" % (PN, PV))
57 raise bb.parse.SkipPackage("Package Float-Point is not compatible with the machine")
58}
59
60USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
61USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}"
62USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
63
64# Inhibit warnings about files being stripped.
65INHIBIT_PACKAGE_STRIP = "1"
66INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
67
68# FIXME: The provided binary doesn't provide soname. If in future BSP
69# release the libraries are fixed, we can drop this hack.
70REALSOLIBS := "${SOLIBS}"
71SOLIBS = "${SOLIBSDEV}"
72
73# For the packages that make up the OpenGL interfaces, inject variables so that
74# they don't get Debian-renamed (which would remove the -mx6 suffix).
75#
76# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
77# the source we cannot fix it. Disable the insane check for now.
78python __anonymous() {
79 packages = d.getVar('PACKAGES', True).split()
80 for p in packages:
81 d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
82
83 for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
84 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
85 ("libgles3",)):
86 fullp = p[0] + "-mx6"
87 pkgs = " ".join(p)
88 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
89 d.appendVar("RREPLACES_" + fullp, pkgs)
90 d.appendVar("RPROVIDES_" + fullp, pkgs)
91 d.appendVar("RCONFLICTS_" + fullp, pkgs)
92
93 # For -dev, the first element is both the Debian and original name
94 fullp += "-dev"
95 pkgs = p[0] + "-dev"
96 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
97 d.appendVar("RREPLACES_" + fullp, pkgs)
98 d.appendVar("RPROVIDES_" + fullp, pkgs)
99 d.appendVar("RCONFLICTS_" + fullp, pkgs)
100}
101
102do_install () {
103 install -d ${D}${libdir}
104 install -d ${D}${includedir}
105
106 cp -a ${S}/usr/lib/*.so* ${D}${libdir}
107 cp -axr ${S}/usr/include/* ${D}${includedir}
108 cp -axr ${S}/opt ${D}
109
110 install -d ${D}${libdir}/pkgconfig
111
112 # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
113 if [ "${USE_X11}" = "yes" ]; then
114 cp -r ${S}/usr/lib/dri ${D}${libdir}
115 backend=x11
116
117 install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
118 install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
119 install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
120 install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
121 #FIXME: WL & X11 is not currently functional
122 #if [ "${USE_WL}" = "yes" ]; then
123 # install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
124 # install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
125 # install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
126 #fi
127 elif [ "${USE_WL}" = "yes" ]; then
128 backend=wl
129
130 install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
131 install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
132 install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
133 install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
134 install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
135 install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
136 install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
137 else
138 install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
139 install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
140 install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
141 install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
142
143 if [ "${USE_DFB}" = "yes" ]; then
144 cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir}
145 backend=dfb
146 else
147 # Regular framebuffer
148 backend=fb
149 fi
150 fi
151
152 # We'll only have one backend here so we rename it to generic name
153 # and avoid rework in other packages, when possible
154 mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0
155 ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2
156 ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so
157 mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0
158 ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
159 ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so
160 mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so
161 mv ${D}${libdir}/libVIVANTE-${backend}.so ${D}${libdir}/libVIVANTE.so
162
163 for backend in wl x11 fb dfb; do
164 find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';'
165 done
166
167 find ${D}${libdir} -type f -exec chmod 644 {} \;
168 find ${D}${includedir} -type f -exec chmod 644 {} \;
169}
170
171S = "${WORKDIR}/${PN}-${PV}"
172
173FILES_${PN} += "/opt"
174FILES_${PN}-dev = "${includedir}"
175FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug"
176
177FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
178FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
179FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
180
181# libEGL.so is used by some demo apps from Freescale
182INSANE_SKIP_libegl-mx6 += "dev-so"
183FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
184FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
185FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
186
187FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
188FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}"
189FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
190
191FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
192FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}"
193FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
194RDEPENDS_libgl-mx6-dev = "libgl-mesa-dev"
195
196# libEGL needs to open libGLESv1.so
197INSANE_SKIP_libgles-mx6 += "dev-so"
198FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
199FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
200FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
201
202# libEGL needs to open libGLESv2.so
203INSANE_SKIP_libgles2-mx6 += "dev-so"
204FILES_libgles2-mx6 = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
205FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
206FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
207RDEPENDS_libgles2-mx6 = "libglslc-mx6"
208
209FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}"
210FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
211FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}"
212
213FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}"
214FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
215FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}"
216RDEPENDS_libopencl-mx6 = "libclc-mx6"
217
218FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}"
219FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
220FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
221
222FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
223FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
224FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
225
226FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
227FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}"
228FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
229
230FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so"
231
232FILES_libvivante-dfb-mx6 = "${libdir}/directfb-1.6-0/gfxdrivers/libdirectfb_gal.so"
233
234INSANE_SKIP_libwayland-viv-mx6 += "dev-so"
235FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}"
236FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
237FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}"
238
239INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so"
240FILES_libgc-wayland-protocol-mx6 = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
241FILES_libgc-wayland-protocol-mx6-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc"
242FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS}"
243
244FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc"
245
246COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
new file mode 100644
index 0000000..dc91d7c
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
@@ -0,0 +1,30 @@
1From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001
2From: Jeremy Stashluk <jstashluk@dekaresearch.com>
3Date: Wed, 30 Jan 2013 13:16:53 -0500
4Subject: [PATCH] change header path to HAL
5
6The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL
7directory under the system. I think this is a problem in the LTIB release as
8well.
9
10Upstream-Status: Pending
11
12Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
13
14---
15 usr/include/gc_vdk_types.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
19===================================================================
20--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h
21+++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
22@@ -39,7 +39,7 @@ extern "C" {
23 #endif
24
25 #include <EGL/egl.h>
26-#include "gc_hal_eglplatform_type.h"
27+#include <HAL/gc_hal_eglplatform_type.h>
28
29
30 /*******************************************************************************
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
new file mode 100644
index 0000000..a21922d
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: egl
7Description: Vivante EGL library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lEGL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir} -DLINUX
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
new file mode 100644
index 0000000..5921583
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: egl
7Description: Vivante EGL library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lEGL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir} -DLINUX
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
new file mode 100644
index 0000000..3eac116
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
@@ -0,0 +1,31 @@
1Avoid conflicting types with Xorg newer code
2
3Upstream-Status: Pending
4Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
5
6Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
7===================================================================
8--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h
9+++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
10@@ -101,7 +101,7 @@ extern gcsPLS gcPLS;
11 typedef struct _gcsTLS * gcsTLS_PTR;
12
13 typedef void (* gctTLS_DESTRUCTOR) (
14- gcsTLS_PTR TLS
15+ gcsTLS_PTR pTLS
16 );
17
18 typedef struct _gcsTLS
19@@ -648,10 +648,10 @@ gcoOS_SetPLSValue(
20 /* Get access to the thread local storage. */
21 gceSTATUS
22 gcoOS_GetTLS(
23- OUT gcsTLS_PTR * TLS
24+ OUT gcsTLS_PTR * pTLS
25 );
26
27- /* Copy the TLS from a source thread. */
28+ /* Copy the pTLS from a source thread. */
29 gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source);
30
31 /* Destroy the objects associated with the current thread. */
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
new file mode 100644
index 0000000..732a073
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
@@ -0,0 +1,34 @@
1From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001
2From: Adrian Alonso <aalonso00@gmail.com>
3Date: Sat, 26 Jan 2013 17:52:04 -0600
4Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs
5
6* Remove header undefs for Always and Status definitions
7
8Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
9---
10 usr/include/HAL/gc_hal_eglplatform.h | 3 ---
11 1 file changed, 3 deletions(-)
12
13diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h
14index a968fe7..e80c65a 100644
15--- a/usr/include/HAL/gc_hal_eglplatform.h
16+++ b/usr/include/HAL/gc_hal_eglplatform.h
17@@ -341,14 +341,11 @@ typedef Pixmap HALNativePixmapType;
18 /* Rename some badly named X defines. */
19 #ifdef Status
20 # define XStatus int
21-# undef Status
22 #endif
23 #ifdef Always
24 # define XAlways 2
25-# undef Always
26 #endif
27 #ifdef CurrentTime
28-# undef CurrentTime
29 # define XCurrentTime 0
30 #endif
31
32--
331.8.1
34
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
new file mode 100644
index 0000000..f4610ea
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
@@ -0,0 +1,10 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4includedir=${prefix}/include
5
6Name: gc_wayland_protocol
7Description: Vivante Wayland Protocol Extension Library
8Version: 0.1
9Cflags: -I${includedir}
10Libs: -L${libdir} -lgc_wayland_protocol
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
new file mode 100644
index 0000000..d97b067
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv1_cm
7Description: Vivante OpenGL ES 1.1 CM library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
new file mode 100644
index 0000000..e801633
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv1_cm
7Description: Vivante OpenGL ES 1.1 CM library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
new file mode 100644
index 0000000..9be46f2
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv2
7Description: Vivante OpenGL ES 2.0 library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
new file mode 100644
index 0000000..57ad807
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv2
7Description: Vivante OpenGL ES 2.0 library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
new file mode 100644
index 0000000..7c00def
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: vg
7Description: Vivante OpenVG 1.1 library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lOpenVG -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
new file mode 100644
index 0000000..94fb91e
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: vg
7Description: Vivante OpenVG 1.1 library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lOpenVG -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
new file mode 100644
index 0000000..ba1b898
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
@@ -0,0 +1,10 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4includedir=${prefix}/include
5
6Name: wayland-egl
7Description: Bind the driver EGL to the Wayland API
8Version: 1.0.0
9Libs: -L${libdir} -lEGL
10Cflags: -I${includedir}
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
new file mode 100644
index 0000000..3fdedd0
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
@@ -0,0 +1,10 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4includedir=${prefix}/include
5
6Name: Wayland Vivante Lib
7Description: Wayland server side library for Vivante's EGL driver
8Version: 0.1
9Cflags: -I${includedir}/wayland-viv
10Libs: -L${libdir} -lwayland-viv
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
new file mode 100644
index 0000000..bed361e
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.1-hfp.bbappend
@@ -0,0 +1 @@
RDEPENDS_libgl-mx6-dev = ""
diff --git a/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
new file mode 100644
index 0000000..5c7727b
--- /dev/null
+++ b/meta-fsl-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
@@ -0,0 +1,11 @@
1# Copyright (C) 2013 Freescale Semiconductor
2# Released under the MIT license (see COPYING.MIT for the terms)
3
4require gpu-viv-bin-mx6q.inc
5
6SRC_URI[md5sum] = "52f5ebbb6a9b5d0eafdb952246de584e"
7SRC_URI[sha256sum] = "8b0386e13d4a7c770f8bc8e7a6119629c5ed379488dd5ef635bc92353f906003"
8
9PACKAGE_FP_TYPE = "hardfp"
10
11RDEPENDS_libgl-mx6-dev = ""
diff --git a/meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
new file mode 100644
index 0000000..f2a736a
--- /dev/null
+++ b/meta-fsl-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
@@ -0,0 +1,10 @@
1# Copyright (C) 2013 Freescale Semiconductor
2
3require recipes-bsp/imx-lib/imx-lib.inc
4
5SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2"
6SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8"
7
8PE = "1"
9
10COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
new file mode 100644
index 0000000..da33ff5
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
@@ -0,0 +1,42 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23# kernel image files are not needed in the image
24RDEPENDS_kernel-base = ""
25
26do_configure_prepend() {
27 # Use multitouch protocol for touchscreen that support it
28 echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig
29 echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig
30
31 # FunctionFS for adb
32 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
33
34 # Enable USB serial support
35 echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig
36 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig
37 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig
38 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig
39
40 # fix imx-vpu break on video decoding
41 echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig
42}
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend
new file mode 100644
index 0000000..df01b62
--- /dev/null
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.10.17.bbappend
@@ -0,0 +1,35 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23# kernel image files are not needed in the image
24RDEPENDS_kernel-base = ""
25
26do_configure_prepend() {
27 # FunctionFS for adb
28 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
29
30 # Enable USB serial support
31 echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig
32 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig
33 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig
34 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig
35}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
new file mode 100644
index 0000000..59a4505
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -0,0 +1,133 @@
1From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Fri, 9 May 2014 10:23:50 +0300
4Subject: [PATCH] Updated kernel arguments for sabre sd
5
6- Enable I2C
7- detect if hdmi is used and change video arguments accordingly
8- disable blanking and cursor blinking
9
10---
11 board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
12 include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++
13 2 files changed, 44 insertions(+)
14
15diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
16index 12d8c56..303b774 100644
17--- a/board/freescale/mx6sabresd/mx6sabresd.c
18+++ b/board/freescale/mx6sabresd/mx6sabresd.c
19@@ -12,6 +12,7 @@
20 #include <asm/arch/mx6-pins.h>
21 #include <asm/errno.h>
22 #include <asm/gpio.h>
23+#include <asm/imx-common/mxc_i2c.h>
24 #include <asm/imx-common/iomux-v3.h>
25 #include <asm/imx-common/boot_mode.h>
26 #include <mmc.h>
27@@ -24,6 +25,7 @@
28 #include <ipu_pixfmt.h>
29 #include <asm/io.h>
30 #include <asm/arch/sys_proto.h>
31+#include <i2c.h>
32 DECLARE_GLOBAL_DATA_PTR;
33
34 #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
35@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
36 #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
37 PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
38
39+#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
40+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \
41+ PAD_CTL_ODE | PAD_CTL_SRE_FAST)
42+
43+#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
44+
45 int dram_init(void)
46 {
47 gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
48@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
49 MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
50 };
51
52+static struct i2c_pads_info i2c_pad_info1 = {
53+ .scl = {
54+ .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
55+ .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
56+ .gp = IMX_GPIO_NR(4, 12)
57+ },
58+ .sda = {
59+ .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
60+ .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
61+ .gp = IMX_GPIO_NR(4, 13)
62+ }
63+};
64+
65 static void setup_spi(void)
66 {
67 imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
68@@ -477,6 +498,8 @@ int board_init(void)
69 setup_spi();
70 #endif
71
72+ setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
73+
74 return 0;
75 }
76
77diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
78index 5ee7fa5..b83bf74 100644
79--- a/include/configs/mx6sabre_common.h
80+++ b/include/configs/mx6sabre_common.h
81@@ -85,6 +85,13 @@
82 /* Command definition */
83 #include <config_cmd_default.h>
84
85+/* I2C Configs */
86+#define CONFIG_CMD_I2C
87+#define CONFIG_SYS_I2C
88+#define CONFIG_SYS_I2C_MXC
89+#define CONFIG_SYS_I2C_SPEED 100000
90+#define CONFIG_I2C_EDID
91+
92 #define CONFIG_CMD_BMODE
93 #define CONFIG_CMD_BOOTZ
94 #define CONFIG_CMD_SETEXPR
95@@ -117,6 +124,15 @@
96 #define EMMC_ENV ""
97 #endif
98
99+#define VIDEOARGS \
100+ "videoargs=" \
101+ "i2c dev 1 ; " \
102+ "if i2c probe 0x50 ; then " \
103+ "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
104+ "else " \
105+ "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
106+ "fi\0"
107+
108 #define CONFIG_EXTRA_ENV_SETTINGS \
109 "script=boot.scr\0" \
110 "uimage=uImage\0" \
111@@ -144,7 +160,11 @@
112 "fi; " \
113 "fi\0" \
114 EMMC_ENV \
115+ VIDEOARGS \
116 "mmcargs=setenv bootargs console=${console},${baudrate} " \
117+ "video=${video} "\
118+ "consoleblank=0 " \
119+ "vt.global_cursor_default=0 " \
120 "root=${mmcroot}\0" \
121 "loadbootscript=" \
122 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
123@@ -153,6 +173,7 @@
124 "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
125 "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
126 "mmcboot=echo Booting from mmc ...; " \
127+ "run videoargs; " \
128 "run mmcargs; " \
129 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
130 "if run loadfdt; then " \
131--
1321.8.3.2
133
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
new file mode 100644
index 0000000..b4ff56f
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.01.bbappend
@@ -0,0 +1,26 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
24SRC_URI += " \
25 file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
26 "
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
new file mode 100644
index 0000000..d97921c
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
@@ -0,0 +1,25 @@
1From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Fri, 10 Jan 2014 12:37:20 +0200
4Subject: [PATCH] nitrogen6x: disable console cursor blinking
5
6---
7 board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
11index d933fa0..2d7c575 100644
12--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
13+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
14@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do
15 done
16
17 setenv bootargs $bootargs $fbmem
18-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
19+setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait"
20
21 if itest.s x$bootpart == x ; then
22 bootpart=1
23--
241.7.10.4
25
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
new file mode 100644
index 0000000..995e418
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
@@ -0,0 +1,81 @@
1From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001
2From: Rainer Keller <rainer.keller@digia.com>
3Date: Fri, 5 Sep 2014 14:39:50 +0200
4Subject: [PATCH] Add support for update recovery linux
5
6---
7 board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++
8 1 file changed, 61 insertions(+)
9
10diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
11index 5bc6170..4116ed4 100644
12--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
13+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
14@@ -1,3 +1,64 @@
15+# Boot2Qt update part begin
16+echo "Boot to Qt"
17+if test "x$boot2qt_update_state" = "x" ; then
18+ setenv boot2qt_update_state valid
19+ saveenv
20+fi
21+
22+# This is a workaround because environment partition is read-only.
23+if fatload mmc 1:1 0x12000000 update/state ; then
24+ mw.b 0x13000000 0x76 1 # v
25+ mw.b 0x13000001 0x75 1 # u
26+ mw.b 0x13000002 0x74 1 # t
27+
28+ if cmp.b 0x12000000 0x13000000 1 ; then
29+ echo "State: Valid"
30+ setenv boot2qt_fat_state valid
31+ setenv boot2qt_update_state valid
32+ saveenv
33+ fi
34+ if cmp.b 0x12000000 0x13000001 1 ; then
35+ echo "State: Update"
36+ setenv boot2qt_fat_state update
37+ fi
38+ if cmp.b 0x12000000 0x13000002 1 ; then
39+ echo "State: Testing"
40+ setenv boot2qt_fat_state testing
41+ fi
42+fi
43+
44+if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then
45+ setenv boot2qt_update_state testing
46+ saveenv
47+ echo "Recovery linux starting..."
48+ setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0"
49+
50+ # Guess dtb name
51+ dtbname="imx6";
52+ if itest.s x6S != "x\$cpu" ; then
53+ dtbname=\${dtbname}q-;
54+ else
55+ dtbname=\${dtbname}s-;
56+ fi
57+
58+ if itest.s x == "x\$board" ; then
59+ board=sabrelite
60+ fi
61+ dtbname=\${dtbname}\${board}.dtb;
62+
63+ fatload mmc 1:1 0x10800000 update/uImage
64+ fatload mmc 1:1 0x12000000 update/${dtbname}
65+ fatload mmc 1:1 0x13000000 update/uRamdisk
66+ bootm 0x10800000 0x13000000 0x12000000
67+fi
68+
69+if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then
70+ setenv boot2qt_update_state invalid
71+ saveenv
72+fi
73+
74+# Boot2Qt update part end
75+
76 # Yocto-specifics
77 setenv bootpart 2
78 setenv bootdir /
79--
801.8.5.5
81
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
new file mode 100644
index 0000000..a479c2b
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -0,0 +1,27 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
24SRC_URI += " \
25 file://0001-nitrogen6x-disable-console-cursor-blinking.patch \
26 file://0002-nitrogen6x-update.patch \
27 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-31 09:41:26 +0000