aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-03-18 08:29:25 -0700
committerGitHub <noreply@github.com>2019-03-18 08:29:25 -0700
commitea6e195ce4fd86a5a6c9984acd9847d6172eab7c (patch)
treebb4cf3f109f5a109dc22b1b5dbde437c12619e69
parenteec816d9022ce667de37f05ce665f4ead9a06e7b (diff)
parent978f5594f1c77c9fba9136e2979c8f9877c03132 (diff)
downloadmeta-amd-ea6e195ce4fd86a5a6c9984acd9847d6172eab7c.tar.gz
meta-amd-ea6e195ce4fd86a5a6c9984acd9847d6172eab7c.tar.bz2
meta-amd-ea6e195ce4fd86a5a6c9984acd9847d6172eab7c.zip
Merge pull request #616 from ArsalanHAwan/extra-pkgs-control
Extra Packages Control using INCLUDE_<component>
-rw-r--r--meta-amdfalconx86/conf/local.conf.append.amdfalconx8626
-rw-r--r--meta-r1000/conf/local.conf.append.r100012
-rw-r--r--meta-r1000/conf/machine/r1000.conf4
-rw-r--r--meta-v1000/conf/local.conf.append.v100027
-rw-r--r--meta-v1000/conf/machine/v1000.conf5
5 files changed, 54 insertions, 20 deletions
diff --git a/meta-amdfalconx86/conf/local.conf.append.amdfalconx86 b/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
index 68cf3405..224e8c60 100644
--- a/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
+++ b/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
@@ -43,17 +43,19 @@ COMMERCIAL_LIC_FLAGS_MULTIMEDIA = "commercial_gstreamer1.0-plugins-ugly \
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.
+# MEL supports various components that can be enabled by setting the corresponding
+# INCLUDE_<component> to "yes".
+# Following is a list of <components> that can be enabled if you want them to be
+# installed/available on your image.
+# Please change the required INCLUDE_<component> to "yes" before building an image, or
+# generating an ADE that can be used to develop apps for these components (if applicable):
+#
+# - VULKAN - Vulkan driver and Loader Layer.
+# It is required to run Vulkan based applications. Vulkan is a new generation graphics
+# and compute API that provides high-efficiency, cross-platform access to modern GPUs.
+#
+# - CODEXL - CodeXL remote agent and some sample applications to verify the GPU debugging
+# and profiling functionality.
+#
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-r1000/conf/local.conf.append.r1000 b/meta-r1000/conf/local.conf.append.r1000
new file mode 100644
index 00000000..0ce2e809
--- /dev/null
+++ b/meta-r1000/conf/local.conf.append.r1000
@@ -0,0 +1,12 @@
+# MEL supports various components that can be enabled by setting the corresponding
+# INCLUDE_<component> to "yes".
+# Following is a list of <components> that can be enabled if you want them to be
+# installed/available on your image.
+# Please change the required INCLUDE_<component> to "yes" before building an image, or
+# generating an ADE that can be used to develop apps for these components (if applicable):
+#
+# - OPENCL - The Open Computing Language.
+# Framework for writing programs that execute across heterogeneous platforms consisting
+# of CPUs, GPUs, DSPs, FPGAs and other processors or hardware accelerators.
+#
+INCLUDE_OPENCL ??= "no"
diff --git a/meta-r1000/conf/machine/r1000.conf b/meta-r1000/conf/machine/r1000.conf
index 0d769c12..c656d290 100644
--- a/meta-r1000/conf/machine/r1000.conf
+++ b/meta-r1000/conf/machine/r1000.conf
@@ -15,7 +15,9 @@ require conf/machine/include/tune-r1000.inc
# Add machine specific AMD features and feature pkgs here
VULKAN_PKGS_r1000 = "amdvlk glslang spirv-tools vulkan-loader-layers rgp"
-AMD_PLATFORM_SPECIFIC_PKGS_r1000 += "opencl"
+AMD_PLATFORM_SPECIFIC_PKGS_r1000 += " \
+ ${@bb.utils.contains('INCLUDE_OPENCL', 'yes', 'opencl', '', d)} \
+ "
include conf/machine/include/amd-common-configurations.inc
include conf/machine/include/amd-customer-configurations.inc
diff --git a/meta-v1000/conf/local.conf.append.v1000 b/meta-v1000/conf/local.conf.append.v1000
index 4c5658ec..34518aa6 100644
--- a/meta-v1000/conf/local.conf.append.v1000
+++ b/meta-v1000/conf/local.conf.append.v1000
@@ -40,10 +40,25 @@ COMMERCIAL_LIC_FLAGS_MULTIMEDIA = "commercial_gstreamer1.0-plugins-ugly \
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.
+# MEL supports various components that can be enabled by setting the corresponding
+# INCLUDE_<component> to "yes".
+# Following is a list of <components> that can be enabled if you want them to be
+# installed/available on your image.
+# Please change the required INCLUDE_<component> to "yes" before building an image, or
+# generating an ADE that can be used to develop apps for these components (if applicable):
+#
+# - VULKAN - Vulkan driver and Loader Layer.
+# It is required to run Vulkan based applications. Vulkan is a new generation graphics
+# and compute API that provides high-efficiency, cross-platform access to modern GPUs.
+#
+# - OPENCL - The Open Computing Language.
+# Framework for writing programs that execute across heterogeneous platforms consisting
+# of CPUs, GPUs, DSPs, FPGAs and other processors or hardware accelerators.
+#
+# - OPENCV - The Open Computer Vision Library.
+# Library of programming functions mainly aimed at real-time computer vision. Used for
+# image-processing on input from image/video files and camera etc.
+#
INCLUDE_VULKAN ??= "no"
+INCLUDE_OPENCL ??= "no"
+INCLUDE_OPENCV ??= "no"
diff --git a/meta-v1000/conf/machine/v1000.conf b/meta-v1000/conf/machine/v1000.conf
index 04bc138d..88460aef 100644
--- a/meta-v1000/conf/machine/v1000.conf
+++ b/meta-v1000/conf/machine/v1000.conf
@@ -15,7 +15,10 @@ require conf/machine/include/tune-v1000.inc
# Add machine specific AMD features and feature pkgs here
VULKAN_PKGS_v1000 = "amdvlk glslang spirv-tools vulkan-loader-layers rgp"
-AMD_PLATFORM_SPECIFIC_PKGS_v1000 += "opencl opencv"
+AMD_PLATFORM_SPECIFIC_PKGS_v1000 += " \
+ ${@bb.utils.contains('INCLUDE_OPENCL', 'yes', 'opencl', '', d)} \
+ ${@bb.utils.contains('INCLUDE_OPENCV', 'yes', 'opencv', '', d)} \
+ "
include conf/machine/include/amd-common-configurations.inc
include conf/machine/include/amd-customer-configurations.inc