aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amdfalconx86/conf
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-10-22 08:08:07 -0700
committerGitHub <noreply@github.com>2019-10-22 08:08:07 -0700
commit8e0cf9ee43840bd7ee004412129ba4aa055f5fc8 (patch)
treeb13804093e413307097cd6788ccdc8b062084013 /meta-amdfalconx86/conf
parent9e1e1da00d8ef569d83a7a742a734dbbf5e0bd13 (diff)
parent3f8062a03dc1d1d5fa386e1f1ca59d56b86a85d1 (diff)
downloadmeta-amd-master.tar.gz
meta-amd-master.tar.bz2
meta-amd-master.zip
Merge pull request #661 from ArsalanHAwan/master-merge-warriorHEADmaster
master: merge warrior
Diffstat (limited to 'meta-amdfalconx86/conf')
-rw-r--r--meta-amdfalconx86/conf/layer.conf13
-rw-r--r--meta-amdfalconx86/conf/local.conf.append.amdfalconx8661
-rw-r--r--meta-amdfalconx86/conf/machine/amdfalconx86.conf61
-rw-r--r--meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc16
4 files changed, 0 insertions, 151 deletions
diff --git a/meta-amdfalconx86/conf/layer.conf b/meta-amdfalconx86/conf/layer.conf
deleted file mode 100644
index 13723e5d..00000000
--- a/meta-amdfalconx86/conf/layer.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "amdfalconx86"
-BBFILE_PATTERN_amdfalconx86 = "^${LAYERDIR}/"
-BBFILE_PRIORITY_amdfalconx86 = "14"
-LAYERSERIES_COMPAT_amdfalconx86 = "sumo"
-
-LAYERDEPENDS_amdfalconx86 = "amd openembedded-layer meta-python"
diff --git a/meta-amdfalconx86/conf/local.conf.append.amdfalconx86 b/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
deleted file mode 100644
index 224e8c60..00000000
--- a/meta-amdfalconx86/conf/local.conf.append.amdfalconx86
+++ /dev/null
@@ -1,61 +0,0 @@
-
-# Set to "yes" to start using the RT Kernel, please
-# run 'bitbake -c clean virtual/kernel' before doing so.
-RT_KERNEL_AMD = "no"
-
-# MEL provides the functionality to build packages with license-restricted
-# algorithms or software. Their configuration variables can be set to
-# "yes" or "no" in the local.conf file to enable or disable the
-# functionality to include them in the build. The option to build these
-# packages is NOT enabled in the default configuration. After enabling the
-# option to build, when you build your target image, the BitBake utility
-# fetches package sources from the canonical upstream location. If you do
-# not have an active network connection, your build with these packages
-# will fail.
-#
-# Building packages with license-restricted algorithms or software may add
-# proprietary IP or functionality with other restrictions to your output.
-# Mentor Graphics has no connection with or responsibility for such
-# license-restricted algorithms or software, and failure to abide by the
-# relevant license terms may have legal consequences.
-#
-# Mentor Graphics does not distribute or endorse sources for license-
-# restricted algorithms or software, and disclaims any liability for their
-# use.
-
-# Using mpv requires the use of license-restricted algorithms
-# or software.
-INCLUDE_MPV ??= "no"
-
-COMMERCIAL_LIC_FLAGS_MPV = "commercial_mpv commercial_ffmpeg commercial_x264"
-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.
-INCLUDE_COMMERCIAL_MULTIMEDIA ??= "no"
-
-COMMERCIAL_LIC_FLAGS_MULTIMEDIA = "commercial_gstreamer1.0-plugins-ugly \
- commercial_lame \
- commercial_mpeg2dec \
- commercial_gstreamer1.0-libav \
- commercial_mpg123"
-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 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"
-INCLUDE_CODEXL ??= "no"
diff --git a/meta-amdfalconx86/conf/machine/amdfalconx86.conf b/meta-amdfalconx86/conf/machine/amdfalconx86.conf
deleted file mode 100644
index b1e66d54..00000000
--- a/meta-amdfalconx86/conf/machine/amdfalconx86.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#@TYPE: Machine
-#@NAME: amdfalconx86
-
-#@DESCRIPTION: Machine configuration for amdfalconx86 systems
-
-# BSP and PATCH versions for MEL releases
-BSP_VERSION = "0"
-PATCH_VERSION = "0"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "linux-yocto-rt", "linux-yocto", d)}"
-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-debug-profile"
-
-VULKAN_PKGS_amdfalconx86 = "glslang spirv-tools vulkan-loader-layers"
-CODEXL_PKGS_amdfalconx86 = "codexl codexl-examples"
-
-include conf/machine/include/amd-common-configurations.inc
-include conf/machine/include/amd-customer-configurations.inc
-
-# Disable GPU if RT kernel is in use
-XSERVER_X86_AMDGPU = "xf86-video-amd \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-radeonsi', '', d)} \
- "
-XSERVER_X86_NOGPU = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)}"
-XSERVER_X86_GPU = "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "${XSERVER_X86_NOGPU}", "${XSERVER_X86_AMDGPU}", d)}"
-
-XSERVER ?= "${XSERVER_X86_BASE} \
- ${XSERVER_X86_EXT} \
- ${XSERVER_X86_FBDEV} \
- ${XSERVER_X86_MODESETTING} \
- ${XSERVER_X86_GPU} \
- "
-
-MACHINE_EXTRA_RRECOMMENDS += "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "", "amdgpu-firmware amd-acp-rt286-load", d)}"
-
-KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "", "snd-soc-acp-pcm snd-soc-acp-rt286-mach", d)}"
-
-# Setup a getty on all serial ports
-# ttyS4/ttyS5 are only needed for Bettongs where console doesn't
-# work on ttyS0/ttyS1 so we hope to at least get a getty running
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyUSB0 115200;ttyS4 115200;ttyS5"
-
-# Enable the kernel console on ttyS0/COM0
-KERNEL_SERIAL_CONSOLE ?= "console=ttyS0,115200n8"
-
-# Enable powerplay
-APPEND += "amdgpu.powerplay=1"
-
-# Disable GPU powergating as a workaround
-APPEND += "amdgpu.pg_mask=0"
-
-TOOLCHAIN_HOST_TASK_append_mel = " ${@bb.utils.contains('INCLUDE_VULKAN', 'yes', "nativesdk-glslang", "", d)}"
-
-MACHINEOVERRIDES =. "amd:amdx86:amdgpu:"
-
-# Metadata used by CodeBench for the ADE
-ADE_CB_CPU = "general.cpu.excavator"
diff --git a/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc b/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc
deleted file mode 100644
index dc3911f5..00000000
--- a/meta-amdfalconx86/conf/machine/include/tune-amdfalconx86.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFAULTTUNE ?= "dbfp4"
-
-require conf/machine/include/x86/arch-x86.inc
-require conf/machine/include/x86-base.inc
-
-# AMD DB-FP4 64bit (MerlinFalcon)
-TUNEVALID[dbfp4] = "Enable AMD DB-FP4 (64 bit) specific processor optimizations"
-TUNECONFLICTS[dbfp4] = "m32 mx32"
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp4", " -march=bdver4", "", d)}"
-
-# Extra tune selections
-AVAILTUNES += "dbfp4"
-TUNE_FEATURES_tune-dbfp4 = "m64 dbfp4"
-BASE_LIB_tune-dbfp4 = "lib64"
-TUNE_PKGARCH_tune-dbfp4 = "dbfp4"
-PACKAGE_EXTRA_ARCHS_tune-dbfp4 = "${TUNE_PKGARCH_tune-dbfp4}"