diff options
45 files changed, 836 insertions, 95 deletions
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample index 22d16ba..06d12de 100644 --- a/conf/bblayers.conf.nvidia-logan.sample +++ b/conf/bblayers.conf.nvidia-logan.sample | |||
@@ -30,14 +30,16 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
30 | BBLAYERS ?= " \ | 30 | BBLAYERS ?= " \ |
31 | ${BSPDIR}/sources/poky/meta \ | 31 | ${BSPDIR}/sources/poky/meta \ |
32 | ${BSPDIR}/sources/poky/meta-yocto \ | 32 | ${BSPDIR}/sources/poky/meta-yocto \ |
33 | ${BSPDIR}/sources/meta-tegra \ | 33 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ |
34 | ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ | ||
34 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 35 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
35 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 36 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | 37 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ |
37 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | 38 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ |
38 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ | 39 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ |
39 | ${BSPDIR}/sources/meta-b2qt \ | 40 | ${BSPDIR}/sources/meta-b2qt \ |
40 | ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \ | 41 | ${BSPDIR}/sources/meta-b2qt/meta-vib3-extras \ |
42 | ${BSPDIR}/sources/meta-b2qt/meta-tegra-extras \ | ||
41 | ${BSPDIR}/sources/meta-mingw \ | 43 | ${BSPDIR}/sources/meta-mingw \ |
42 | ${BSPDIR}/sources/meta-qt5 \ | 44 | ${BSPDIR}/sources/meta-qt5 \ |
43 | " | 45 | " |
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample index f0dfbb7..2d1d18f 100644 --- a/conf/bblayers.conf.nvidia-tegra.sample +++ b/conf/bblayers.conf.nvidia-tegra.sample | |||
@@ -30,17 +30,18 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
30 | BBLAYERS ?= " \ | 30 | BBLAYERS ?= " \ |
31 | ${BSPDIR}/sources/poky/meta \ | 31 | ${BSPDIR}/sources/poky/meta \ |
32 | ${BSPDIR}/sources/poky/meta-yocto \ | 32 | ${BSPDIR}/sources/poky/meta-yocto \ |
33 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | ||
34 | ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ | ||
33 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 35 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
34 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 36 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
35 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | 37 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ |
36 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ | 38 | ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ |
37 | ${BSPDIR}/sources/meta-qt5 \ | 39 | ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ |
38 | ${BSPDIR}/sources/meta-openembedded/meta-ruby \ | ||
39 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | ||
40 | ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ | ||
41 | ${BSPDIR}/sources/meta-b2qt \ | 40 | ${BSPDIR}/sources/meta-b2qt \ |
42 | ${BSPDIR}/sources/meta-b2qt/meta-nvidia-extras \ | 41 | ${BSPDIR}/sources/meta-b2qt/meta-vib4-extras \ |
42 | ${BSPDIR}/sources/meta-b2qt/meta-tegra-extras \ | ||
43 | ${BSPDIR}/sources/meta-mingw \ | 43 | ${BSPDIR}/sources/meta-mingw \ |
44 | ${BSPDIR}/sources/meta-qt5 \ | ||
44 | " | 45 | " |
45 | 46 | ||
46 | BBLAYERS_NON_REMOVABLE ?= " \ | 47 | BBLAYERS_NON_REMOVABLE ?= " \ |
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf index 21dd305..5849cfd 100644 --- a/conf/distro/include/nvidia-logan.conf +++ b/conf/distro/include/nvidia-logan.conf | |||
@@ -19,7 +19,13 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | DISTRO_FEATURES_remove += "wayland" | 22 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" |
23 | |||
24 | DEFAULTTUNE = "cortexa15hf-neon" | ||
25 | |||
26 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | ||
27 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' | ||
28 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | ||
23 | 29 | ||
24 | MACHINE_EXTRA_INSTALL = "\ | 30 | MACHINE_EXTRA_INSTALL = "\ |
25 | libegl \ | 31 | libegl \ |
@@ -36,3 +42,17 @@ MACHINE_EXTRA_INSTALL_SDK = "\ | |||
36 | libdrm-nv-dev \ | 42 | libdrm-nv-dev \ |
37 | " | 43 | " |
38 | 44 | ||
45 | PREFERRED_PROVIDER_libdrm ?= "libdrm-nv" | ||
46 | PREFERRED_PROVIDER_drm ?= "libdrm-nv" | ||
47 | |||
48 | BBMASK ?= " " | ||
49 | BBMASK .= "\ | ||
50 | |meta-vib3/recipes-kernel/linux-libc-headers\ | ||
51 | |meta-vib3/recipes-devtools/binutils\ | ||
52 | |meta-vib3/recipes-core/eglibc\ | ||
53 | |meta-vib3/recipes-core/systemd\ | ||
54 | |meta-vib3/recipes-connectivity\ | ||
55 | |meta-vib3/recipes-multimedia/pulseaudio\ | ||
56 | |meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\ | ||
57 | |meta-vib3/recipes-core/packagegroups\ | ||
58 | " | ||
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index 12b57d4..baf7f5c 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf | |||
@@ -20,34 +20,43 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/tegra.inc | ||
24 | |||
23 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" | 25 | TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" |
24 | DISTRO_FEATURES_DEFAULT += "wayland weston" | 26 | DISTRO_FEATURES_DEFAULT += "wayland" |
27 | |||
28 | KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' | ||
29 | PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}' | ||
30 | NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" | ||
25 | 31 | ||
26 | MACHINE_EXTRA_INSTALL = "\ | 32 | MACHINE_EXTRA_INSTALL = "\ |
27 | tegra-firmware-fecs \ | 33 | tegra-firmware-fecs \ |
28 | tegra-firmware-gmicrocode \ | 34 | tegra-firmware-gmicrocode \ |
29 | tegra-firmware-gpccs \ | 35 | tegra-firmware-gpccs \ |
30 | tegra-firmware-gpmu \ | 36 | tegra-firmware-gpmu \ |
31 | tegra-firmware-gshader \ | 37 | tegra-firmware-gshader \ |
32 | tegra-firmware-pmu \ | 38 | tegra-firmware-pmu \ |
33 | tegra-firmware-prod-fuse \ | 39 | tegra-firmware-prod-fuse \ |
34 | tegra-firmware-xusb \ | 40 | tegra-firmware-xusb \ |
35 | tegra-firmware-vic \ | 41 | tegra-firmware-vic \ |
36 | tegra-firmware-nvdec \ | 42 | tegra-firmware-nvdec \ |
37 | tegra-firmware-nvenc \ | 43 | tegra-firmware-nvenc \ |
38 | tegra-firmware-nvjpeg \ | 44 | tegra-firmware-nvjpeg \ |
39 | tegra-drivers \ | 45 | tegra-drivers \ |
40 | virtual/libegl \ | 46 | virtual/libegl \ |
41 | virtual/libgles2 \ | 47 | virtual/libgles2 \ |
42 | libdrm-nv \ | 48 | libdrm-nv \ |
43 | asound-conf \ | 49 | asound-conf \ |
44 | " | 50 | " |
45 | 51 | ||
46 | PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers" | 52 | PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers" |
47 | PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers" | 53 | PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers" |
48 | PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers" | 54 | PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers" |
49 | PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers" | 55 | PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers" |
50 | PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers" | 56 | PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers" |
57 | PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers" | ||
58 | PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers" | ||
59 | PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers" | ||
51 | 60 | ||
52 | PREFERRED_PROVIDER_wayland ?= "wayland-nv" | 61 | PREFERRED_PROVIDER_wayland ?= "wayland-nv" |
53 | PREFERRED_PROVIDER_wayland-native ?= "wayland-nv" | 62 | PREFERRED_PROVIDER_wayland-native ?= "wayland-nv" |
@@ -64,4 +73,7 @@ BBMASK .= "\ | |||
64 | |meta-vib4/recipes-devtools\ | 73 | |meta-vib4/recipes-devtools\ |
65 | |meta-vib4/recipes-extended\ | 74 | |meta-vib4/recipes-extended\ |
66 | |meta-vib4/recipes-multimedia/audiomanager\ | 75 | |meta-vib4/recipes-multimedia/audiomanager\ |
76 | |meta-vib4/recipes-core/glibc\ | ||
77 | |meta-vib4/recipes-support/lvm2\ | ||
78 | |meta-vib4/recipes-kernel/linux-libc-headers\ | ||
67 | " | 79 | " |
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc new file mode 100644 index 0000000..618a634 --- /dev/null +++ b/conf/distro/include/tegra.inc | |||
@@ -0,0 +1,17 @@ | |||
1 | python set_nv_drv_version () { | ||
2 | # Boiler plate code to setup bitbake objects | ||
3 | d = e.data | ||
4 | |||
5 | nv_drv_version = d.getVar('NV_DRV_VER', True) | ||
6 | if nv_drv_version != "ignore": | ||
7 | # FIXME: When we add support to internal builds, both debug and release | ||
8 | # builds will need to be considered | ||
9 | path = d.getVar('PLATFORM_TOPDIR', True) | ||
10 | get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \ | ||
11 | | grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}" | ||
12 | # Execute cmd | ||
13 | nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip() | ||
14 | # Store returned value in NV_DRV_VER | ||
15 | d.setVar('NV_DRV_VER', nv_drv_version) | ||
16 | } | ||
17 | |||
diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend deleted file mode 100644 index f9d9cc6..0000000 --- a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | do_kernel_defconfig_prepend_tegra-t18x () { | ||
2 | } | ||
3 | |||
4 | do_install_append_tegra-t18x () { | ||
5 | s=$(readlink -m "${S}") | ||
6 | kernsrc="${STAGING_KERNEL_DIR}" | ||
7 | |||
8 | if [ "${s}" != "${kernsrc}" ]; then | ||
9 | mkdir -p "${kernsrc}" | ||
10 | rm -rf "${kernsrc}" | ||
11 | mv "${S}" "${STAGING_KERNEL_DIR}" | ||
12 | ln -sf "${kernsrc}" "${s}" | ||
13 | fi | ||
14 | } | ||
15 | |||
16 | do_compile_prepend_tegra-t18x () { | ||
17 | if [ -z "${TOOLCHAIN_PATH}" ] ; then | ||
18 | echo "TOOLCHAIN_PATH must be set" | ||
19 | exit -1 | ||
20 | fi | ||
21 | |||
22 | export PATH="${TOOLCHAIN_PATH}/usr/bin/aarch64-gnu-linux:${PATH}" | ||
23 | |||
24 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${B}/.config | ||
25 | echo "CONFIG_USB_ACM=m" >> ${B}/.config | ||
26 | |||
27 | make olddefconfig | ||
28 | } | ||
diff --git a/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend b/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend deleted file mode 100644 index 1800e5e..0000000 --- a/meta-nvidia-extras/recipes/packagegroups/packagegroup-b2qt-embedded-toolchain-target.bbappend +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | RDEPENDS_${PN}_remove_tegra-t18x = "\ | ||
2 | libgbm-dev \ | ||
3 | " | ||
4 | |||
diff --git a/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend b/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend deleted file mode 100644 index d86ee9d..0000000 --- a/meta-nvidia-extras/recipes/systemd/systemd_%.bbappend +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend_tegra-t18x := "${THISDIR}/${PN}:" | ||
diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend deleted file mode 100644 index 85a2996..0000000 --- a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | GRAPHICS_PACKAGES = " \ | ||
2 | virtual/libgles2 \ | ||
3 | virtual/libegl \ | ||
4 | virtual/egl \ | ||
5 | libgbm \ | ||
6 | libgbm-dev \ | ||
7 | " | ||
8 | |||
9 | PROVIDES_append = " ${GRAPHICS_PACKAGES}" | ||
10 | RPROVIDES_append_${PN} = " ${GRAPHICS_PACKAGES}" | ||
11 | CONFLICTS_append_${PN} = " ${GRAPHICS_PACKAGES}" | ||
12 | REPLACES_append_${PN} = " ${GRAPHICS_PACKAGES}" | ||
diff --git a/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend deleted file mode 100644 index db0da64..0000000 --- a/meta-nvidia-extras/recipes/wayland-nv/wayland-nv.bbappend +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | EXTRA_PROVIDES = " \ | ||
2 | virtual/wayland-native \ | ||
3 | wayland-native \ | ||
4 | " | ||
5 | |||
6 | PROVIDES_append = "${EXTRA_PROVIDES}" | ||
7 | RPROVIDES_append_${PN} = "${EXTRA_PROVIDES}" | ||
8 | CONFLICTS_append_${PN} = "${EXTRA_PROVIDES}" | ||
9 | REPLACES_append_${PN} = "${EXTRA_PROVIDES}" | ||
diff --git a/meta-nvidia-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf index aa447a5..b4a9671 100644 --- a/meta-nvidia-extras/conf/layer.conf +++ b/meta-tegra-extras/conf/layer.conf | |||
@@ -27,6 +27,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ | |||
27 | ${LAYERDIR}/recipes*/*/*.bbappend \ | 27 | ${LAYERDIR}/recipes*/*/*.bbappend \ |
28 | " | 28 | " |
29 | 29 | ||
30 | BBFILE_COLLECTIONS += "b2qt_nvidia" | 30 | BBFILE_COLLECTIONS += "b2qt_tegra" |
31 | BBFILE_PATTERN_b2qt_nvidia := "^${LAYERDIR}/" | 31 | BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/" |
32 | BBFILE_PRIORITY_b2qt_nvidia = "20" | 32 | BBFILE_PRIORITY_b2qt_tegra = "20" |
diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend b/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend index 86f0571..86f0571 100644 --- a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend +++ b/meta-tegra-extras/recipes/connman-conf/connman-conf.bbappend | |||
diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf b/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf index a1e45b9..a1e45b9 100644 --- a/meta-nvidia-extras/recipes/connman-conf/connman-conf/nvidia-logan/main.conf +++ b/meta-tegra-extras/recipes/connman-conf/connman-conf/main.conf | |||
diff --git a/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend new file mode 100644 index 0000000..9544e7b --- /dev/null +++ b/meta-tegra-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend | |||
@@ -0,0 +1,25 @@ | |||
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 | PROVIDES = "virtual/egl virtual/libgles2" | ||
23 | RPROVIDES_${PN} = "libegl libegl-dev libgles2 libgles2-dev" | ||
24 | RCONFLICTS_${PN} = "libegl-mesa libegl-mesa-dev libgles2-mesa libgles2-mesa-dev" | ||
25 | RREPLACES_${PN} = "libegl-mesa lbegl-mesa-dev libgles2-mesa libgles2-mesa-dev" | ||
diff --git a/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend new file mode 100644 index 0000000..5d0b777 --- /dev/null +++ b/meta-tegra-extras/recipes/firmware/tegra-firmware_1.0.bbappend | |||
@@ -0,0 +1,27 @@ | |||
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 | # WARNING: FILESEXTRAPATHS-variable, must always use _prepend (or _append) | ||
23 | FILESEXTRAPATHS_tegra-x1_prepend = "__default:" | ||
24 | FILESEXTRAPATHS_tegra-t18x_prepend = "__default:" | ||
25 | |||
26 | # ERROR: QA Issue: Files/directories were installed but not shipped in any package | ||
27 | FILES_${PN}-gk20a = "${FILES__${PN}-gk20a}" | ||
diff --git a/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend new file mode 100644 index 0000000..4c839e2 --- /dev/null +++ b/meta-tegra-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend | |||
@@ -0,0 +1,22 @@ | |||
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 | ALLOW_EMPTY_${PN} = "1" | ||
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc new file mode 100644 index 0000000..6fe139e --- /dev/null +++ b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv/libdrm.pc | |||
@@ -0,0 +1,11 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=${exec_prefix}/lib | ||
4 | includedir=${prefix}/include | ||
5 | |||
6 | Name: libdrm | ||
7 | Description: Userspace interface to kernel DRM services | ||
8 | Version: 2.4.66 | ||
9 | Libs: -L${libdir} -ldrm | ||
10 | Cflags: -I${includedir} -I${includedir}/libdrm | ||
11 | |||
diff --git a/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend new file mode 100644 index 0000000..fdef52d --- /dev/null +++ b/meta-tegra-extras/recipes/libdrm-nv/libdrm-nv_1.0.bbappend | |||
@@ -0,0 +1,32 @@ | |||
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 | |||
24 | SRC_URI += " file://libdrm.pc" | ||
25 | SRC_URI_remove_nvidia-logan = "file://${PLATFORM_TOPDIR}/include/drm_fourcc.h" | ||
26 | |||
27 | do_install_append() { | ||
28 | install -d ${D}/usr/lib/pkgconfig | ||
29 | install -m 0776 ${WORKDIR}/libdrm.pc ${D}/usr/lib/pkgconfig/libdrm.pc | ||
30 | } | ||
31 | |||
32 | PACKAGES += "${PN}-dev" | ||
diff --git a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend index 97acf20..97acf20 100644 --- a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend +++ b/meta-tegra-extras/recipes/qt5/qtwebengine_git.bbappend | |||
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc new file mode 100644 index 0000000..da1f5f7 --- /dev/null +++ b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers/egl.pc | |||
@@ -0,0 +1,12 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: egl | ||
7 | Description: Mesa EGL library | ||
8 | Requires.private: libdrm >= 2.4.24 | ||
9 | Version: 9.1.6 | ||
10 | Libs: -L${libdir} -lEGL | ||
11 | Libs.private: -lm -lpthread -ldl | ||
12 | Cflags: -I${includedir} | ||
diff --git a/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend new file mode 100644 index 0000000..fbee576 --- /dev/null +++ b/meta-tegra-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend | |||
@@ -0,0 +1,41 @@ | |||
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 | |||
24 | SRC_URI += " file://egl.pc" | ||
25 | FILES_${PN} += "egl.pc" | ||
26 | |||
27 | GRAPHICS_PACKAGES = " \ | ||
28 | virtual/libgles2 \ | ||
29 | virtual/libegl \ | ||
30 | virtual/egl \ | ||
31 | virtual/libgl \ | ||
32 | virtual/libgles1 \ | ||
33 | virtual/mesa \ | ||
34 | libgbm \ | ||
35 | libgbm-dev \ | ||
36 | " | ||
37 | |||
38 | do_install_append_tegra-t18x() { | ||
39 | install -d ${D}/usr/lib/pkgconfig | ||
40 | install -m 0775 ${WORKDIR}/egl.pc ${D}/${libdir}/pkgconfig | ||
41 | } | ||
diff --git a/meta-vib3-extras/conf/layer.conf b/meta-vib3-extras/conf/layer.conf new file mode 100644 index 0000000..8a3341f --- /dev/null +++ b/meta-vib3-extras/conf/layer.conf | |||
@@ -0,0 +1,32 @@ | |||
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 | # We have a conf and classes directory, append to BBPATH | ||
23 | BBPATH .= ":${LAYERDIR}" | ||
24 | |||
25 | # We have a recipes directory, add to BBFILES | ||
26 | BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ | ||
27 | ${LAYERDIR}/recipes*/*/*.bbappend \ | ||
28 | " | ||
29 | |||
30 | BBFILE_COLLECTIONS += "b2qt_vib3" | ||
31 | BBFILE_PATTERN_b2qt_vib3 := "^${LAYERDIR}/" | ||
32 | BBFILE_PRIORITY_b2qt_vib3 = "20" | ||
diff --git a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend new file mode 100644 index 0000000..6080c3f --- /dev/null +++ b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend | |||
@@ -0,0 +1,26 @@ | |||
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 | SRC_URI_remove = " \ | ||
23 | file://${PLATFORM_TOPDIR}/lib-target/NETB_img.bin \ | ||
24 | file://${PLATFORM_TOPDIR}/lib-target/nvhost_msenc031.fw \ | ||
25 | file://${PLATFORM_TOPDIR}/lib-target/vic03_ucode.bin \ | ||
26 | " | ||
diff --git a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend new file mode 100644 index 0000000..3ff042b --- /dev/null +++ b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend | |||
@@ -0,0 +1,9 @@ | |||
1 | |||
2 | # Use our kernel instead of yocto which defaults to mainline 3.10. | ||
3 | # Commit id of our kernel's include/uapi directory in kernel tree - | ||
4 | # 8c37e1bfe7dd26a9d4cf4510460a75264c906444 | ||
5 | SRC_URI = "file://${KERN_DIR}/linux.tar.bz2" | ||
6 | |||
7 | # Extracting linux.tar.bz2 creates directories | ||
8 | # <top>/vibrante-oss-src/kernel | ||
9 | S = "${WORKDIR}/vibrante-oss-src/kernel" | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch new file mode 100644 index 0000000..ee61a74 --- /dev/null +++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Behan Webster <behanw@converseincode.com> | ||
3 | Date: Wed, 24 Sep 2014 01:06:46 +0100 | ||
4 | Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h | ||
5 | |||
6 | With compilers which follow the C99 standard (like modern versions of gcc and | ||
7 | clang), "extern inline" does the wrong thing (emits code for an externally | ||
8 | linkable version of the inline function). In this case using static inline | ||
9 | and removing the NULL version of return_address in return_address.c does | ||
10 | the right thing. | ||
11 | |||
12 | Signed-off-by: Behan Webster <behanw@converseincode.com> | ||
13 | Reviewed-by: Mark Charlebois <charlebm@gmail.com> | ||
14 | Acked-by: Steven Rostedt <rostedt@goodmis.org> | ||
15 | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | ||
16 | --- | ||
17 | arch/arm/include/asm/ftrace.h | 2 +- | ||
18 | arch/arm/kernel/return_address.c | 5 ----- | ||
19 | 2 files changed, 1 insertion(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h | ||
22 | index f89515a..2bb8cac 100644 | ||
23 | --- a/arch/arm/include/asm/ftrace.h | ||
24 | +++ b/arch/arm/include/asm/ftrace.h | ||
25 | @@ -45,7 +45,7 @@ void *return_address(unsigned int); | ||
26 | |||
27 | #else | ||
28 | |||
29 | -extern inline void *return_address(unsigned int level) | ||
30 | +static inline void *return_address(unsigned int level) | ||
31 | { | ||
32 | return NULL; | ||
33 | } | ||
34 | diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c | ||
35 | index fafedd8..f6aa84d 100644 | ||
36 | --- a/arch/arm/kernel/return_address.c | ||
37 | +++ b/arch/arm/kernel/return_address.c | ||
38 | @@ -63,11 +63,6 @@ void *return_address(unsigned int level) | ||
39 | #warning "TODO: return_address should use unwind tables" | ||
40 | #endif | ||
41 | |||
42 | -void *return_address(unsigned int level) | ||
43 | -{ | ||
44 | - return NULL; | ||
45 | -} | ||
46 | - | ||
47 | #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ | ||
48 | |||
49 | EXPORT_SYMBOL_GPL(return_address); | ||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch new file mode 100644 index 0000000..66f031f --- /dev/null +++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch | |||
@@ -0,0 +1,133 @@ | |||
1 | From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Wed, 13 Apr 2016 15:42:49 +0300 | ||
4 | Subject: [PATCH] Change "extern inline" to "static inline" | ||
5 | |||
6 | With compilers which follow the C99 standard (like modern versions of gcc and | ||
7 | clang), "extern inline" does the wrong thing (emits code for an externally | ||
8 | linkable version of the inline function). "static inline" is the correct choice | ||
9 | instead. | ||
10 | --- | ||
11 | drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++----- | ||
12 | drivers/staging/rtl8712/ieee80211.h | 4 ++-- | ||
13 | lib/mpi/mpi-inline.h | 2 +- | ||
14 | lib/mpi/mpi-internal.h | 16 ++++++++-------- | ||
15 | 4 files changed, 16 insertions(+), 16 deletions(-) | ||
16 | |||
17 | diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h | ||
18 | index 502bfdb..1c8d026 100644 | ||
19 | --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h | ||
20 | +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h | ||
21 | @@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev) | ||
22 | return ((struct ieee80211_device *)netdev_priv(dev))->priv; | ||
23 | } | ||
24 | |||
25 | -extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
26 | +static inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
27 | { | ||
28 | /* Single white space is for Linksys APs */ | ||
29 | if (essid_len == 1 && essid[0] == ' ') | ||
30 | @@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
31 | return 1; | ||
32 | } | ||
33 | |||
34 | -extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode) | ||
35 | +static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode) | ||
36 | { | ||
37 | /* | ||
38 | * It is possible for both access points and our device to support | ||
39 | @@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod | ||
40 | return 0; | ||
41 | } | ||
42 | |||
43 | -extern inline int ieee80211_get_hdrlen(u16 fc) | ||
44 | +static inline int ieee80211_get_hdrlen(u16 fc) | ||
45 | { | ||
46 | int hdrlen = IEEE80211_3ADDR_LEN; | ||
47 | |||
48 | @@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee); | ||
49 | |||
50 | extern const long ieee80211_wlan_frequencies[]; | ||
51 | |||
52 | -extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee) | ||
53 | +static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) | ||
54 | { | ||
55 | ieee->scans++; | ||
56 | } | ||
57 | |||
58 | -extern inline int ieee80211_get_scans(struct ieee80211_device *ieee) | ||
59 | +static inline int ieee80211_get_scans(struct ieee80211_device *ieee) | ||
60 | { | ||
61 | return ieee->scans; | ||
62 | } | ||
63 | diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h | ||
64 | index 21515c3..7518061 100644 | ||
65 | --- a/drivers/staging/rtl8712/ieee80211.h | ||
66 | +++ b/drivers/staging/rtl8712/ieee80211.h | ||
67 | @@ -734,7 +734,7 @@ enum ieee80211_state { | ||
68 | #define IEEE_G (1<<2) | ||
69 | #define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) | ||
70 | |||
71 | -extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
72 | +static inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
73 | { | ||
74 | /* Single white space is for Linksys APs */ | ||
75 | if (essid_len == 1 && essid[0] == ' ') | ||
76 | @@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) | ||
77 | return 1; | ||
78 | } | ||
79 | |||
80 | -extern inline int ieee80211_get_hdrlen(u16 fc) | ||
81 | +static inline int ieee80211_get_hdrlen(u16 fc) | ||
82 | { | ||
83 | int hdrlen = 24; | ||
84 | |||
85 | diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h | ||
86 | index e2b3985..c245ea3 100644 | ||
87 | --- a/lib/mpi/mpi-inline.h | ||
88 | +++ b/lib/mpi/mpi-inline.h | ||
89 | @@ -30,7 +30,7 @@ | ||
90 | #define G10_MPI_INLINE_H | ||
91 | |||
92 | #ifndef G10_MPI_INLINE_DECL | ||
93 | -#define G10_MPI_INLINE_DECL extern inline | ||
94 | +#define G10_MPI_INLINE_DECL static inline | ||
95 | #endif | ||
96 | |||
97 | G10_MPI_INLINE_DECL mpi_limb_t | ||
98 | diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h | ||
99 | index 77adcf6..4566d11 100644 | ||
100 | --- a/lib/mpi/mpi-internal.h | ||
101 | +++ b/lib/mpi/mpi-internal.h | ||
102 | @@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count); | ||
103 | int mpi_lshift_limbs(MPI a, unsigned int count); | ||
104 | |||
105 | /*-- mpihelp-add.c --*/ | ||
106 | -mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
107 | - mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
108 | +//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
109 | +// mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
110 | mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
111 | mpi_ptr_t s2_ptr, mpi_size_t size); | ||
112 | -mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
113 | - mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
114 | +//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
115 | +// mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
116 | |||
117 | /*-- mpihelp-sub.c --*/ | ||
118 | -mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
119 | - mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
120 | +//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
121 | +// mpi_size_t s1_size, mpi_limb_t s2_limb); | ||
122 | mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, | ||
123 | mpi_ptr_t s2_ptr, mpi_size_t size); | ||
124 | -mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
125 | - mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
126 | +//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, | ||
127 | +// mpi_ptr_t s2_ptr, mpi_size_t s2_size); | ||
128 | |||
129 | /*-- mpihelp-cmp.c --*/ | ||
130 | int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); | ||
131 | -- | ||
132 | 1.9.1 | ||
133 | |||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch new file mode 100644 index 0000000..8bbc38b --- /dev/null +++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | --- a/drivers/platform/tegra/tegra_cl_dvfs.c 2016-04-19 13:05:46.897056724 +0300 | ||
2 | +++ b/drivers/platform/tegra/tegra_cl_dvfs.c 2016-04-19 12:55:28.053751626 +0300 | ||
3 | @@ -1021,7 +1021,7 @@ | ||
4 | |||
5 | static void cl_dvfs_calibrate(struct tegra_cl_dvfs *cld) | ||
6 | { | ||
7 | - u32 val, data; | ||
8 | + u32 val=0, data=0; | ||
9 | ktime_t now; | ||
10 | unsigned long rate; | ||
11 | unsigned long step = RATE_STEP(cld); | ||
12 | @@ -3303,7 +3303,7 @@ | ||
13 | |||
14 | static int monitor_get(void *data, u64 *val) | ||
15 | { | ||
16 | - u32 v, s; | ||
17 | + u32 v=0, s=0; | ||
18 | unsigned long flags; | ||
19 | struct clk *c = (struct clk *)data; | ||
20 | struct tegra_cl_dvfs *cld = ((struct clk *)data)->u.dfll.cl_dvfs; | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch new file mode 100644 index 0000000..fc8fe9f --- /dev/null +++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- a/drivers/platform/tegra/tegra12_clocks.c 2016-04-19 13:51:34.912235128 +0300 | ||
2 | +++ b/drivers/platform/tegra/tegra12_clocks.c 2016-04-19 13:51:55.739478254 +0300 | ||
3 | @@ -1331,7 +1331,7 @@ | ||
4 | */ | ||
5 | static void tegra12_cpu_clk_init(struct clk *c) | ||
6 | { | ||
7 | - c->state = (!is_lp_cluster() == (c->u.cpu.mode == MODE_G))? ON : OFF; | ||
8 | + c->state = ((!is_lp_cluster()) == (c->u.cpu.mode == MODE_G))? ON : OFF; | ||
9 | } | ||
10 | |||
11 | static int tegra12_cpu_clk_enable(struct clk *c) | ||
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend new file mode 100644 index 0000000..5d4b59a --- /dev/null +++ b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend | |||
@@ -0,0 +1,57 @@ | |||
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_prepend := "__default:${THISDIR}/${PN}:" | ||
23 | |||
24 | DEPENDS_remove = "external-tegra-toolchain" | ||
25 | do_kernel_defconfig[depends] = "kern-tools-native:do_populate_sysroot" | ||
26 | |||
27 | SRC_URI += "\ | ||
28 | file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ | ||
29 | file://0001-Change-extern-inline-to-static-inline.patch \ | ||
30 | file://Fix_compile_error_in_tegra_drivers.patch \ | ||
31 | file://Fix_compiler_error_in_tegra12_lock.patch \ | ||
32 | " | ||
33 | |||
34 | do_compile_prepend () { | ||
35 | # Cross compiling exports | ||
36 | export ARCH=${TARGET_ARCH} | ||
37 | export CROSS_COMPILE=${CROSS_COMPILE} | ||
38 | |||
39 | echo "CONFIG_FHANDLE=y" >> ${B}/.config | ||
40 | make olddefconfig | ||
41 | } | ||
42 | |||
43 | do_install_append() { | ||
44 | s=$(readlink -m "${S}") | ||
45 | kernsrc="${STAGING_KERNEL_DIR}" | ||
46 | |||
47 | if [ "${s}" != "${kernsrc}" ]; then | ||
48 | mkdir -p "${kernsrc}" | ||
49 | rm -rf "${kernsrc}" | ||
50 | mv "${S}" "${STAGING_KERNEL_DIR}" | ||
51 | ln -sf "${kernsrc}" "${s}" | ||
52 | fi | ||
53 | } | ||
54 | |||
55 | python do_patch () { | ||
56 | bb.build.exec_func('patch_do_patch', d) | ||
57 | } | ||
diff --git a/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend index cd74ddf..c33ee23 100644 --- a/meta-nvidia-extras/recipes/qt5/qtbase_git.bbappend +++ b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend | |||
@@ -19,5 +19,5 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | DEPENDS_nvidia-logan += "graphics-headers" | 22 | DEPENDS += "graphics-headers" |
23 | PACKAGECONFIG_nvidia-logan += "kms" | 23 | PACKAGECONFIG += "kms" |
diff --git a/meta-vib4-extras/conf/layer.conf b/meta-vib4-extras/conf/layer.conf new file mode 100644 index 0000000..89fb47e --- /dev/null +++ b/meta-vib4-extras/conf/layer.conf | |||
@@ -0,0 +1,32 @@ | |||
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 | # We have a conf and classes directory, append to BBPATH | ||
23 | BBPATH .= ":${LAYERDIR}" | ||
24 | |||
25 | # We have a recipes directory, add to BBFILES | ||
26 | BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ | ||
27 | ${LAYERDIR}/recipes*/*/*.bbappend \ | ||
28 | " | ||
29 | |||
30 | BBFILE_COLLECTIONS += "b2qt_vib4" | ||
31 | BBFILE_PATTERN_b2qt_vib4 := "^${LAYERDIR}/" | ||
32 | BBFILE_PRIORITY_b2qt_vib4 = "20" | ||
diff --git a/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend new file mode 100644 index 0000000..d7353bc --- /dev/null +++ b/meta-vib4-extras/recipes/glibc/glibc_2.22.bbappend | |||
@@ -0,0 +1,15 @@ | |||
1 | # Append --enable-kernel flag to configure flags | ||
2 | # only for target build case. | ||
3 | # We are setting this to kernel 3.18 to keep glibc | ||
4 | # compatbile across all 3.18 series | ||
5 | # We will not support < 3.18 for V4L: | ||
6 | EXTRA_OECONF_append_class-target = " \ | ||
7 | --enable-kernel=3.18 \ | ||
8 | " | ||
9 | |||
10 | # Search $PWD/eglibc-2.18 for additional patches | ||
11 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | ||
12 | |||
13 | # Placeholder for patches | ||
14 | SRC_URI_append_class-target = " \ | ||
15 | " | ||
diff --git a/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend new file mode 100644 index 0000000..f2bdba1 --- /dev/null +++ b/meta-vib4-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend | |||
@@ -0,0 +1,7 @@ | |||
1 | # Use our kernel instead of yocto which defaults to mainline 3.18 | ||
2 | SRC_URI = "file://${KERN_DIR}/linux.tar.bz2" | ||
3 | PV = "3.18" | ||
4 | |||
5 | # Extracting linux.tar.bz2 creates directories | ||
6 | # <top>/vibrante-oss-src/kernel | ||
7 | S = "${WORKDIR}/vibrante-oss-src/kernel" | ||
diff --git a/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend new file mode 100644 index 0000000..8861fc3 --- /dev/null +++ b/meta-vib4-extras/recipes/linux/linux-nvidia.bbappend | |||
@@ -0,0 +1,57 @@ | |||
1 | |||
2 | ############################################################################## | ||
3 | ## | ||
4 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
5 | ## Contact: http://www.qt.io/licensing/ | ||
6 | ## | ||
7 | ## This file is part of the Boot to Qt meta layer. | ||
8 | ## | ||
9 | ## $QT_BEGIN_LICENSE:COMM$ | ||
10 | ## | ||
11 | ## Commercial License Usage | ||
12 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
13 | ## accordance with the commercial license agreement provided with the | ||
14 | ## Software or, alternatively, in accordance with the terms contained in | ||
15 | ## a written agreement between you and The Qt Company. For licensing terms | ||
16 | ## and conditions see http://www.qt.io/terms-conditions. For further | ||
17 | ## information use the contact form at http://www.qt.io/contact-us. | ||
18 | ## | ||
19 | ## $QT_END_LICENSE$ | ||
20 | ## | ||
21 | ############################################################################## | ||
22 | |||
23 | do_kernel_defconfig_prepend () { | ||
24 | } | ||
25 | |||
26 | do_compile_prepend () { | ||
27 | # cross_compile_exports | ||
28 | export ARCH=${KERNEL_ARCH} | ||
29 | export CROSS_COMPILE=${CROSS_COMPILE} | ||
30 | |||
31 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${B}/.config | ||
32 | echo "CONFIG_USB_ACM=m" >> ${B}/.config | ||
33 | |||
34 | make olddefconfig | ||
35 | } | ||
36 | |||
37 | do_install () { | ||
38 | kernel_do_install | ||
39 | |||
40 | s=$(readlink -m "${S}") | ||
41 | kernsrc="${STAGING_KERNEL_DIR}" | ||
42 | |||
43 | if [ "${s}" != "${kernsrc}" ]; then | ||
44 | mkdir -p "${kernsrc}" | ||
45 | rm -rf "${kernsrc}" | ||
46 | mv "${S}" "${STAGING_KERNEL_DIR}" | ||
47 | ln -sf "${kernsrc}" "${s}" | ||
48 | fi | ||
49 | } | ||
50 | |||
51 | do_deploy() { | ||
52 | kernel_do_deploy | ||
53 | } | ||
54 | |||
55 | do_compile () { | ||
56 | kernel_do_compile | ||
57 | } | ||
diff --git a/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch index 629ccf4..629ccf4 100644 --- a/meta-nvidia-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch +++ b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch | |||
diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend new file mode 100644 index 0000000..9b56df1 --- /dev/null +++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend | |||
@@ -0,0 +1,22 @@ | |||
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_prepend := "${THISDIR}/${PN}:" | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend new file mode 100644 index 0000000..2c46f2d --- /dev/null +++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend | |||
@@ -0,0 +1,41 @@ | |||
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 | |||
24 | SRC_URI += " \ | ||
25 | file://wayland-client.pc \ | ||
26 | file://wayland-cursor.pc \ | ||
27 | file://wayland-egl.pc \ | ||
28 | file://wayland-server.pc \ | ||
29 | file://${PLATFORM_TOPDIR}/include/wayland-egl-core.h \ | ||
30 | " | ||
31 | |||
32 | FILES_${PN} += "${libdir}/pkgconfig" | ||
33 | |||
34 | WAYLAND_PACKAGES += "wayland-dev" | ||
35 | |||
36 | do_install_append() { | ||
37 | install -d ${D}${libdir}/pkgconfig | ||
38 | install -m 0776 ${WORKDIR}/*.pc ${D}${libdir}/pkgconfig | ||
39 | install -d ${D}${includedir} | ||
40 | install -m 0775 ${PLATFORM_TOPDIR}/include/wayland-egl-core.h ${D}${includedir} | ||
41 | } | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc new file mode 100644 index 0000000..e639768 --- /dev/null +++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc | |||
@@ -0,0 +1,12 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | datarootdir=${prefix}/share | ||
4 | pkgdatadir=/usr/share/wayland | ||
5 | libdir=/usr/lib | ||
6 | includedir=/usr/include | ||
7 | |||
8 | Name: Wayland Client | ||
9 | Description: Wayland client side library | ||
10 | Version: 1.6.0 | ||
11 | Cflags: -I${includedir} | ||
12 | Libs: -L${libdir} -lwayland-client | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc new file mode 100644 index 0000000..36538ad --- /dev/null +++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc | |||
@@ -0,0 +1,10 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: Wayland Cursor | ||
7 | Description: Wayland cursor helper library | ||
8 | Version: 1.6.0 | ||
9 | Cflags: -I${includedir} | ||
10 | Libs: -L${libdir} -lwayland-cursor | ||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc new file mode 100644 index 0000000..dc8393f --- /dev/null +++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc | |||
@@ -0,0 +1,11 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: wayland-egl | ||
7 | Description: wayland-egl library | ||
8 | Version: 9.1.6 | ||
9 | Libs: -L${libdir} -lwayland-egl | ||
10 | Cflags: -I${includedir} | ||
11 | |||
diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc new file mode 100644 index 0000000..dab87b9 --- /dev/null +++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc | |||
@@ -0,0 +1,12 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=/usr | ||
3 | datarootdir=${prefix}/share | ||
4 | pkgdatadir=/usr/share/wayland | ||
5 | libdir=/usr/lib | ||
6 | includedir=/usr/include | ||
7 | |||
8 | Name: Wayland Server | ||
9 | Description: Server side implementation of the Wayland protocol | ||
10 | Version: 1.6.0 | ||
11 | Cflags: -I${includedir} | ||
12 | Libs: -L${libdir} -lwayland-server | ||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 28ccfa3..4c1e70f 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -73,16 +73,21 @@ | |||
73 | path="sources/meta-intel" | 73 | path="sources/meta-intel" |
74 | groups="notdefault,external,intel"/> | 74 | groups="notdefault,external,intel"/> |
75 | 75 | ||
76 | <project name="meta-tegra" | 76 | <project name="nvidia-layer" |
77 | remote="playground" | 77 | remote="playground" |
78 | revision="3125d29a5c58a471b67104d1bff965df38eb3115" | 78 | revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7" |
79 | path="sources/meta-tegra" | 79 | path="sources/nvidia-layer" |
80 | groups="notdefault,internal"/> | 80 | groups="notdefault,internal"/> |
81 | <project name="jetson-tk1-pro" | 81 | <project name="jetson-tk1-pro" |
82 | remote="playground" | 82 | remote="playground" |
83 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" | 83 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" |
84 | path="sources/jetson-tk1-pro" | 84 | path="sources/jetson-tk1-pro" |
85 | groups="notdefault,internal"/> | 85 | groups="notdefault,internal"/> |
86 | <project name="vibrante-t186" | ||
87 | remote="playground" | ||
88 | revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f" | ||
89 | path="sources/vibrante-t186" | ||
90 | groups="notdefault,internal"/> | ||
86 | <project name="meta-smx6" | 91 | <project name="meta-smx6" |
87 | remote="playground" | 92 | remote="playground" |
88 | revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" | 93 | revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" |
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml index 29b401c..6044ae5 100644 --- a/scripts/manifest_jethro.xml +++ b/scripts/manifest_jethro.xml | |||
@@ -73,16 +73,21 @@ | |||
73 | path="sources/meta-intel" | 73 | path="sources/meta-intel" |
74 | groups="notdefault,external,intel"/> | 74 | groups="notdefault,external,intel"/> |
75 | 75 | ||
76 | <project name="meta-tegra" | 76 | <project name="nvidia-layer" |
77 | remote="playground" | 77 | remote="playground" |
78 | revision="master" | 78 | revision="master" |
79 | path="sources/meta-tegra" | 79 | path="sources/nvidia-layer" |
80 | groups="notdefault,internal"/> | 80 | groups="notdefault,internal"/> |
81 | <project name="jetson-tk1-pro" | 81 | <project name="jetson-tk1-pro" |
82 | remote="playground" | 82 | remote="playground" |
83 | revision="master" | 83 | revision="master" |
84 | path="sources/jetson-tk1-pro" | 84 | path="sources/jetson-tk1-pro" |
85 | groups="notdefault,internal"/> | 85 | groups="notdefault,internal"/> |
86 | <project name="vibrante-t186" | ||
87 | remote="playground" | ||
88 | revision="master" | ||
89 | path="sources/vibrante-t186" | ||
90 | groups="notdefault,internal"/> | ||
86 | <project name="meta-smx6" | 91 | <project name="meta-smx6" |
87 | remote="playground" | 92 | remote="playground" |
88 | revision="fido" | 93 | revision="fido" |
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 19f7ffa..1fb4d89 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
@@ -72,8 +72,11 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
72 | intel-corei7-64) | 72 | intel-corei7-64) |
73 | LAYERSCONF="bblayers.conf.intel.sample" | 73 | LAYERSCONF="bblayers.conf.intel.sample" |
74 | ;; | 74 | ;; |
75 | nvidia-logan|tegra-x1|tegra-t18x) | 75 | nvidia-logan) |
76 | LAYERSCONF="bblayers.conf.nvidia.sample" | 76 | LAYERSCONF="bblayers.conf.nvidia-logan.sample" |
77 | ;; | ||
78 | tegra-x1|tegra-t18x) | ||
79 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" | ||
77 | ;; | 80 | ;; |
78 | emulator) | 81 | emulator) |
79 | LAYERSCONF="bblayers.conf.emulator.sample" | 82 | LAYERSCONF="bblayers.conf.emulator.sample" |
diff --git a/scripts/upload.sh b/scripts/upload.sh index 60e7e14..fc9c837 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh | |||
@@ -33,10 +33,11 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img | |||
33 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 33 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
34 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ | 34 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ |
35 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf | 35 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf |
36 | elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then | 36 | elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ |
37 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then | ||
37 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 38 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
38 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ | 39 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ |
39 | $PWD/tmp/deploy/images/${MACHINE}/zImage | 40 | $PWD/tmp/deploy/images/${MACHINE}/*Image |
40 | fi | 41 | fi |
41 | 42 | ||
42 | if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then | 43 | if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then |