summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-07 13:51:54 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-10 09:11:43 +0200
commitfecccd7ebf62b8da88569d229b5c7bb3938aaa76 (patch)
treefcbc636ebacf8bac1016cae7ba18f630ff3df476
parent75e3021c7c0ded371e2baf8f11ad4443495497d1 (diff)
While at it also update the comment in recipes-graphics/mesa/mesa_%.bbappend. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
-rw-r--r--conf/machine/include/tegra-base.inc8
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/aplay.desktop (renamed from recipes-bsp/trdx-nv-binaries/files/aplay.desktop)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/egl.pc (renamed from recipes-bsp/trdx-nv-binaries/files/egl.pc)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/eglplatform.h (renamed from recipes-bsp/trdx-nv-binaries/files/eglplatform.h)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/gles.pc (renamed from recipes-bsp/trdx-nv-binaries/files/gles.pc)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/glesv2.pc (renamed from recipes-bsp/trdx-nv-binaries/files/glesv2.pc)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/khronos_headers.tgz (renamed from recipes-bsp/trdx-nv-binaries/files/khronos_headers.tgz)bin279190 -> 279190 bytes
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/mimeapps.list (renamed from recipes-bsp/trdx-nv-binaries/files/mimeapps.list)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/nvgstplayer.desktop (renamed from recipes-bsp/trdx-nv-binaries/files/nvgstplayer.desktop)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/nvsamples-hardfp.patch (renamed from recipes-bsp/trdx-nv-binaries/files/nvsamples-hardfp.patch)bin6479 -> 6479 bytes
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/nvsamples-no-binary-shaders.patch (renamed from recipes-bsp/trdx-nv-binaries/files/nvsamples-no-binary-shaders.patch)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/files/nvsamples-oe.patch (renamed from recipes-bsp/trdx-nv-binaries/files/nvsamples-oe.patch)0
-rw-r--r--recipes-bsp/tdx-nv-binaries/nvsamples.bb (renamed from recipes-bsp/trdx-nv-binaries/nvsamples.bb)2
-rw-r--r--recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb (renamed from recipes-bsp/trdx-nv-binaries/trdx-nv-binaries.bb)0
-rw-r--r--recipes-graphics/mesa/mesa_%.bbappend2
15 files changed, 6 insertions, 6 deletions
diff --git a/conf/machine/include/tegra-base.inc b/conf/machine/include/tegra-base.inc
index 8477e02..145f572 100644
--- a/conf/machine/include/tegra-base.inc
+++ b/conf/machine/include/tegra-base.inc
@@ -20,9 +20,9 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
PREFERRED_PROVIDER_virtual/mesa = "mesa"
-PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
+PREFERRED_PROVIDER_virtual/egl = "tdx-nv-binaries"
+PREFERRED_PROVIDER_virtual/libgles1 = "tdx-nv-binaries"
+PREFERRED_PROVIDER_virtual/libgles2 = "tdx-nv-binaries"
# Install NV binaries which contains tegra X-Server drivers when X11 is chosen
-MACHINE_EXTRA_RRECOMMENDS_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'trdx-nv-binaries', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tdx-nv-binaries', '', d)}"
diff --git a/recipes-bsp/trdx-nv-binaries/files/aplay.desktop b/recipes-bsp/tdx-nv-binaries/files/aplay.desktop
index ead86f3..ead86f3 100644
--- a/recipes-bsp/trdx-nv-binaries/files/aplay.desktop
+++ b/recipes-bsp/tdx-nv-binaries/files/aplay.desktop
diff --git a/recipes-bsp/trdx-nv-binaries/files/egl.pc b/recipes-bsp/tdx-nv-binaries/files/egl.pc
index 3af7eec..3af7eec 100644
--- a/recipes-bsp/trdx-nv-binaries/files/egl.pc
+++ b/recipes-bsp/tdx-nv-binaries/files/egl.pc
diff --git a/recipes-bsp/trdx-nv-binaries/files/eglplatform.h b/recipes-bsp/tdx-nv-binaries/files/eglplatform.h
index 72b5f2d..72b5f2d 100644
--- a/recipes-bsp/trdx-nv-binaries/files/eglplatform.h
+++ b/recipes-bsp/tdx-nv-binaries/files/eglplatform.h
diff --git a/recipes-bsp/trdx-nv-binaries/files/gles.pc b/recipes-bsp/tdx-nv-binaries/files/gles.pc
index 91387c9..91387c9 100644
--- a/recipes-bsp/trdx-nv-binaries/files/gles.pc
+++ b/recipes-bsp/tdx-nv-binaries/files/gles.pc
diff --git a/recipes-bsp/trdx-nv-binaries/files/glesv2.pc b/recipes-bsp/tdx-nv-binaries/files/glesv2.pc
index 356a1cb..356a1cb 100644
--- a/recipes-bsp/trdx-nv-binaries/files/glesv2.pc
+++ b/recipes-bsp/tdx-nv-binaries/files/glesv2.pc
diff --git a/recipes-bsp/trdx-nv-binaries/files/khronos_headers.tgz b/recipes-bsp/tdx-nv-binaries/files/khronos_headers.tgz
index 5eb5db7..5eb5db7 100644
--- a/recipes-bsp/trdx-nv-binaries/files/khronos_headers.tgz
+++ b/recipes-bsp/tdx-nv-binaries/files/khronos_headers.tgz
Binary files differ
diff --git a/recipes-bsp/trdx-nv-binaries/files/mimeapps.list b/recipes-bsp/tdx-nv-binaries/files/mimeapps.list
index 6a513dc..6a513dc 100644
--- a/recipes-bsp/trdx-nv-binaries/files/mimeapps.list
+++ b/recipes-bsp/tdx-nv-binaries/files/mimeapps.list
diff --git a/recipes-bsp/trdx-nv-binaries/files/nvgstplayer.desktop b/recipes-bsp/tdx-nv-binaries/files/nvgstplayer.desktop
index f85659c..f85659c 100644
--- a/recipes-bsp/trdx-nv-binaries/files/nvgstplayer.desktop
+++ b/recipes-bsp/tdx-nv-binaries/files/nvgstplayer.desktop
diff --git a/recipes-bsp/trdx-nv-binaries/files/nvsamples-hardfp.patch b/recipes-bsp/tdx-nv-binaries/files/nvsamples-hardfp.patch
index 43376d7..43376d7 100644
--- a/recipes-bsp/trdx-nv-binaries/files/nvsamples-hardfp.patch
+++ b/recipes-bsp/tdx-nv-binaries/files/nvsamples-hardfp.patch
Binary files differ
diff --git a/recipes-bsp/trdx-nv-binaries/files/nvsamples-no-binary-shaders.patch b/recipes-bsp/tdx-nv-binaries/files/nvsamples-no-binary-shaders.patch
index 73b27a1..73b27a1 100644
--- a/recipes-bsp/trdx-nv-binaries/files/nvsamples-no-binary-shaders.patch
+++ b/recipes-bsp/tdx-nv-binaries/files/nvsamples-no-binary-shaders.patch
diff --git a/recipes-bsp/trdx-nv-binaries/files/nvsamples-oe.patch b/recipes-bsp/tdx-nv-binaries/files/nvsamples-oe.patch
index 5b8e137..5b8e137 100644
--- a/recipes-bsp/trdx-nv-binaries/files/nvsamples-oe.patch
+++ b/recipes-bsp/tdx-nv-binaries/files/nvsamples-oe.patch
diff --git a/recipes-bsp/trdx-nv-binaries/nvsamples.bb b/recipes-bsp/tdx-nv-binaries/nvsamples.bb
index 1b309ea..493ec8f 100644
--- a/recipes-bsp/trdx-nv-binaries/nvsamples.bb
+++ b/recipes-bsp/tdx-nv-binaries/nvsamples.bb
@@ -1,7 +1,7 @@
SECTION = "graphical/utils"
SUMMARY = "Nvidia samples for OpenGL ES, OpenGL ES headers"
LICENSE = "CLOSED"
-DEPENDS = "trdx-nv-binaries virtual/libx11 libsm libice"
+DEPENDS = "tdx-nv-binaries virtual/libx11 libsm libice"
PR = "r1"
diff --git a/recipes-bsp/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb
index cd5f668..cd5f668 100644
--- a/recipes-bsp/trdx-nv-binaries/trdx-nv-binaries.bb
+++ b/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 84d0dbe..ac56148 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,7 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
# tegra2, tegra3
-# we use binary only EGL, GL ES1, GL ES2 drivers (package trdx-nv-binaries)
+# we use binary only EGL, GL ES1, GL ES2 drivers (package tdx-nv-binaries)
# adapted from meta-fsl-arm/recipes-graphics/mesa/
PACKAGECONFIG_remove_tegra = "egl gles"