aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amdfalconx86
diff options
context:
space:
mode:
authorAdeel Arshad <adeel_arshad@mentor.com>2016-11-29 17:45:41 +0500
committerAdeel Arshad <adeel_arshad@mentor.com>2016-11-30 13:55:44 +0500
commitc9d0cdb6b4ec946f1e10847e0b5808eaccb5d78c (patch)
tree7e5a288835f61f098600b46fc557156f524979ab /meta-amdfalconx86
parentd1449af0ee1557388ad2b665f3427f724ace23e5 (diff)
downloadmeta-amd-c9d0cdb6b4ec946f1e10847e0b5808eaccb5d78c.tar.gz
meta-amd-c9d0cdb6b4ec946f1e10847e0b5808eaccb5d78c.tar.bz2
meta-amd-c9d0cdb6b4ec946f1e10847e0b5808eaccb5d78c.zip
amdfalconx86/conf: split INCLUDE_GAMING_COMPONENTS
We have analyzed that the configuration variable INCLUDE_GAMING_COMPONENTS, is no longer valid as the components it include are not particularly specific to gaming. So we have splitted it into two configuration variables INCLUDE_VULKAN and INCLUDE_CODEXL. Signed-off-by: Adeel Arshad <adeel_arshad@mentor.com>
Diffstat (limited to 'meta-amdfalconx86')
-rw-r--r--meta-amdfalconx86/conf/local.conf.append.amdfalconx8633
-rw-r--r--meta-amdfalconx86/conf/machine/amdfalconx86.conf2
2 files changed, 19 insertions, 16 deletions
diff --git a/meta-amdfalconx86/conf/local.conf.append.amdfalconx86 b/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
index 56552668..742f5e5e 100644
--- a/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
+++ b/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
@@ -28,8 +28,8 @@ RT_KERNEL_AMD = "no"
INCLUDE_MPV ??= "no"
COMMERCIAL_LIC_FLAGS_MPV = "commercial_ffmpeg commercial_x264"
-LICENSE_FLAGS_WHITELIST .= "${@' ${COMMERCIAL_LIC_FLAGS_MPV}' if bb.utils.to_boolean('${INCLUDE_MPV}') else ''}"
-CORE_IMAGE_EXTRA_INSTALL .= "${@' mpv' if bb.utils.to_boolean('${INCLUDE_MPV}') else ''}"
+LICENSE_FLAGS_WHITELIST_append = "${@' ${COMMERCIAL_LIC_FLAGS_MPV}' if bb.utils.to_boolean('${INCLUDE_MPV}') else ''}"
+CORE_IMAGE_EXTRA_INSTALL_append = "${@' mpv' if bb.utils.to_boolean('${INCLUDE_MPV}') else ''}"
# Certain multimedia formats also require license restricted codecs and
# software components which are not included in MEL build by default.
@@ -40,17 +40,20 @@ COMMERCIAL_LIC_FLAGS_MULTIMEDIA = "commercial_gstreamer1.0-plugins-ugly \
commercial_mpeg2dec \
commercial_gstreamer1.0-libav \
commercial_mpg123"
-LICENSE_FLAGS_WHITELIST .= "${@' ${COMMERCIAL_LIC_FLAGS_MULTIMEDIA}' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
-CORE_IMAGE_EXTRA_INSTALL .= "${@' packagegroup-multimedia-risky' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
-
-# MEL has support for gaming components including LunarG SDK,
-# CodeXL etc. In order to include these components in your final
-# image or generating an ADE which can be used to develop for/against
-# these please change the below define to "yes" before building the
+LICENSE_FLAGS_WHITELIST_append = "${@' ${COMMERCIAL_LIC_FLAGS_MULTIMEDIA}' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
+CORE_IMAGE_EXTRA_INSTALL_append = "${@' packagegroup-multimedia-risky' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
+
+# MEL has support for Vulkan/LunarG SDK components.
+# These components are required to run the Vulkan based applications.
+# In order to include these components in your final
+# image or generating an ADE that can be used to develop for/against these
+# please change the below define to "yes" before building the
# image or generating ADE.
-# The list of components this package provides can be seen in the
-# RDEPENDS list of:
-# meta-amd/common/recipes-core/packagegroups/packagegroup-gaming.bb
-INCLUDE_GAMING_COMPONENTS ??= "no"
-
-CORE_IMAGE_EXTRA_INSTALL .= "${@' packagegroup-gaming' if bb.utils.to_boolean('${INCLUDE_GAMING_COMPONENTS}') else ''}"
+INCLUDE_VULKAN ??= "no"
+
+# MEL has support for CodeXL.
+# This include CodeXL remote agent and some sample applications to
+# verify the GPU debugging and profiling functionality.
+# In order to include these components in your final
+# image please change the below define to "yes" before building the image.
+INCLUDE_CODEXL ??= "no"
diff --git a/meta-amdfalconx86/conf/machine/amdfalconx86.conf b/meta-amdfalconx86/conf/machine/amdfalconx86.conf
index f6556ff2..9025ce31 100644
--- a/meta-amdfalconx86/conf/machine/amdfalconx86.conf
+++ b/meta-amdfalconx86/conf/machine/amdfalconx86.conf
@@ -41,6 +41,6 @@ KERNEL_SERIAL_CONSOLE ?= "console=ttyS0,115200n8"
# Enable powerplay
APPEND += "amdgpu.powerplay=1 amdgpu.pg_mask=0"
-TOOLCHAIN_HOST_TASK_append = " ${@bb.utils.contains('INCLUDE_GAMING_COMPONENTS', 'yes', "nativesdk-glslang", "", d)}"
+TOOLCHAIN_HOST_TASK_append = " ${@bb.utils.contains('INCLUDE_VULKAN', 'yes', "nativesdk-glslang", "", d)}"
MACHINEOVERRIDES =. "amd:amdx86:amdgpu:"