diff options
| -rw-r--r-- | common/conf/machine/include/amd-common-configurations.inc | 9 | ||||
| -rw-r--r-- | common/conf/machine/include/amd-features.inc | 48 | ||||
| -rw-r--r-- | meta-amdfalconx86/conf/machine/amdfalconx86.conf | 5 | ||||
| -rw-r--r-- | meta-steppeeagle/conf/machine/steppeeagle.conf | 5 | ||||
| -rw-r--r-- | meta-v1000/conf/machine/v1000.conf | 4 |
5 files changed, 30 insertions, 41 deletions
diff --git a/common/conf/machine/include/amd-common-configurations.inc b/common/conf/machine/include/amd-common-configurations.inc index 5322c780..db2424f4 100644 --- a/common/conf/machine/include/amd-common-configurations.inc +++ b/common/conf/machine/include/amd-common-configurations.inc @@ -48,3 +48,12 @@ IMAGE_OVERHEAD_FACTOR = "1.1" MACHINE_FEATURES_append_amdgpu = " x11" MACHINE_FEATURES_append_radeon = " x11" + +# Add common feartures to be supported for all machines here +EXTRA_IMAGE_FEATURES += "amd-misc-pkgs" + +# Add the basic features we know these overrides support +EXTRA_IMAGE_FEATURES_append_amdgpu := " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "multimedia", "amd-feature-multimedia", "", d)} \ + ${@bb.utils.contains_any("EXTRA_IMAGE_FEATURES", "graphics", "amd-feature-graphics", "", d)}" +EXTRA_IMAGE_FEATURES_append_radeon := " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "multimedia", "amd-feature-multimedia", "", d)} \ + ${@bb.utils.contains_any("EXTRA_IMAGE_FEATURES", "graphics", "amd-feature-graphics", "", d)}" diff --git a/common/conf/machine/include/amd-features.inc b/common/conf/machine/include/amd-features.inc index a099f65d..3b27db27 100644 --- a/common/conf/machine/include/amd-features.inc +++ b/common/conf/machine/include/amd-features.inc @@ -1,23 +1,20 @@ # This file defines AMD Features that can be added as EXTRA_IMAGE_FEATURES to -# different machines based on what is supported on a machine. This gives a broad -# flexibility and control over packages being installed on a machine for any image -# without needing to create bbappends for all the images that are to be supported. +# different machines based on what is supported on a machine (MACHINE_FEATURES) +# and which additional features a user is requesting through EXTRA_IMAGE_FEATURES. +# This gives a broad flexibility and control over packages being installed on a +# machine for any image without needing to create bbappends for all the images +# that are to be supported. # # > Each feature can contain packages and packagegroups as its components. -# > Feature components can be dependent on DISTRO, IMAGE_FEATURE, or any variable -# in general. e.g.: Components of "amd-feature-graphics" may be dependent on -# "x11-base" as an IMAGE_FEATURE. Some packages may only be included for a -# specific DISTRO. Some packages may only be installed if user allows them in -# local.conf etc. -# > Each machine must add the required features to EXTRA_IMAGE_FEATURES in its -# own machine config file. -# > All required features must be added to a machine regardless of the image -# being built, but make sure that feature components are included based on -# dependency conditions. e.g. say "amd-feature-graphics" was added to a machine -# that supported graphics, but components of this feature must not be installed -# on an image that is only console based such as "core-image-base", therefore -# such components must depend on an IMAGE_FEATURE that is based on graphics -# such as "x11-base". +# > Feature components can be dependent on DISTRO, EXTRA_IMAGE_FEATURES, or any +# variable in general other than a particular image's related variable so most +# things should be based on global configs rather than image configs. +# e.g.: Components of "amd-feature-graphics" may be dependent on "graphics" as +# an EXTRA_IMAGE_FEATURE. Some packages may only be included for a specific +# DISTRO. Some packages may only be installed if user allows them in local.conf etc. +# > Each machine must add the requested features to EXTRA_IMAGE_FEATURES in its +# own machine config file regardless of the image being built, if that particular +# feature is not handled in the common fragments. # > Each machine can also override feature components in its own machine config # when adding the feature to EXTRA_IMAGE_FEATURES. e.g.: A feature may be added # to a specific machine with minimal (or extended) packages based on requirement. @@ -31,16 +28,9 @@ # * amd-feature-debug-profile : Debugging and Profiling tools # * <add more features here> : <feature summary> -# Add common feartures to be supported for all machines here -EXTRA_IMAGE_FEATURES += "amd-misc-pkgs" -EXTRA_IMAGE_FEATURES_append_amdgpu = " amd-feature-multimedia \ - ${@bb.utils.contains("DISTRO", "mel", "multimedia", "", d)}" -EXTRA_IMAGE_FEATURES_append_radeon = " amd-feature-multimedia \ - ${@bb.utils.contains("DISTRO", "mel", "multimedia", "", d)}" - GSTREAMER_PKGS ?= " \ - ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "gstreamer1.0-meta-x11-base", "", d)} \ - ${@bb.utils.contains("IMAGE_FEATURES", "tools-audio", "gstreamer1.0-meta-audio", "", d)} \ + ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "gstreamer1.0-meta-x11-base", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "gstreamer1.0-meta-audio", "", d)} \ gstreamer1.0-meta-debug \ gstreamer1.0-meta-video \ gstreamer1.0-omx \ @@ -69,11 +59,11 @@ FEATURE_PACKAGES_amd-feature-multimedia = "\ " FEATURE_PACKAGES_amd-feature-graphics = "\ - ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", bb.utils.contains("INCLUDE_VULKAN", "yes", "${VULKAN_PKGS}", "", d), "", d)} \ + ${@bb.utils.contains("INCLUDE_VULKAN", "yes", "${VULKAN_PKGS}", "", d)} \ ${AMD_FEATURE_GRAPHICS_PKGS} \ " -FEATURE_PACKAGES_amd-feature-graphics_append_amdgpu = " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "mesa-demos", "", d)}" -FEATURE_PACKAGES_amd-feature-graphics_append_radeon = " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "mesa-demos", "", d)}" +FEATURE_PACKAGES_amd-feature-graphics_append_amdgpu = " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "mesa-demos", "", d)}" +FEATURE_PACKAGES_amd-feature-graphics_append_radeon = " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "mesa-demos", "", d)}" FEATURE_PACKAGES_amd-feature-networking = "\ ${@bb.utils.contains("DISTRO", "mel", "${DPDK_PKGS} strongswan", "", d)} \ diff --git a/meta-amdfalconx86/conf/machine/amdfalconx86.conf b/meta-amdfalconx86/conf/machine/amdfalconx86.conf index b4001abc..644d2377 100644 --- a/meta-amdfalconx86/conf/machine/amdfalconx86.conf +++ b/meta-amdfalconx86/conf/machine/amdfalconx86.conf @@ -9,9 +9,8 @@ PREFERRED_VERSION_linux-yocto-rt ?= "4.4%" require conf/machine/include/tune-amdfalconx86.inc # Add machine specific AMD features and feature pkgs here -EXTRA_IMAGE_FEATURES += "amd-feature-graphics amd-feature-debug-profile" -# Specify the features from MEL that we want to pick up -EXTRA_IMAGE_FEATURES_append_mel = " graphics" +EXTRA_IMAGE_FEATURES += "amd-feature-debug-profile" + VULKAN_PKGS_amdfalconx86 = "glslang spirv-tools vulkan-loader-layers vulkan-tools vulkan-samples" CODEXL_PKGS_amdfalconx86 = "codexl codexl-examples" diff --git a/meta-steppeeagle/conf/machine/steppeeagle.conf b/meta-steppeeagle/conf/machine/steppeeagle.conf index ae13359d..d6fdab1b 100644 --- a/meta-steppeeagle/conf/machine/steppeeagle.conf +++ b/meta-steppeeagle/conf/machine/steppeeagle.conf @@ -7,11 +7,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" require conf/machine/include/tune-steppeeagle.inc -# Add machine specific AMD features and feature pkgs here -EXTRA_IMAGE_FEATURES += "amd-feature-graphics" -# Specify the features from MEL that we want to pick up -EXTRA_IMAGE_FEATURES_append_mel = " graphics" - include conf/machine/include/amd-common-configurations.inc include conf/machine/include/amd-customer-configurations.inc diff --git a/meta-v1000/conf/machine/v1000.conf b/meta-v1000/conf/machine/v1000.conf index 883ca6c6..c8176ce9 100644 --- a/meta-v1000/conf/machine/v1000.conf +++ b/meta-v1000/conf/machine/v1000.conf @@ -11,10 +11,6 @@ PREFERRED_PROVIDER_llvm ?= "llvm6.0" require conf/machine/include/tune-v1000.inc # Add machine specific AMD features and feature pkgs here -EXTRA_IMAGE_FEATURES += "amd-feature-graphics" -# Specify the features from MEL that we want to pick up -EXTRA_IMAGE_FEATURES_append_mel = " graphics" - VULKAN_PKGS_v1000 = "amdvlk glslang spirv-tools vulkan-loader-layers vulkan-tools vulkan-samples rgp" AMD_PLATFORM_SPECIFIC_PKGS_v1000 += "opencl" |