aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-09-03 08:14:35 -0700
committerGitHub <noreply@github.com>2019-09-03 08:14:35 -0700
commita963882200708b8e064166b1fca38b94e6719fb6 (patch)
treee873fc6e2e487aaf692fee3732dd7b9f1f0500eb
parentb7114e35656bfd0f3d5dc6ed8c4a9868aa6f412c (diff)
parent343193c21de7d39f33851ba5f7dca08255bc59ee (diff)
downloadmeta-amd-a963882200708b8e064166b1fca38b94e6719fb6.tar.gz
meta-amd-a963882200708b8e064166b1fca38b94e6719fb6.tar.bz2
meta-amd-a963882200708b8e064166b1fca38b94e6719fb6.zip
Merge pull request #648 from ArsalanHAwan/warrior-fixes
warrior: fix for audio, and remove mel ade configs
-rw-r--r--meta-amd-bsp/conf/machine/e3000.conf3
-rw-r--r--meta-amd-bsp/conf/machine/r1000.conf5
-rw-r--r--meta-amd-bsp/conf/machine/v1000.conf5
-rw-r--r--meta-amd-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend4
-rw-r--r--meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch17
-rw-r--r--meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend5
6 files changed, 0 insertions, 39 deletions
diff --git a/meta-amd-bsp/conf/machine/e3000.conf b/meta-amd-bsp/conf/machine/e3000.conf
index 4b0e41ee..1d89c3cb 100644
--- a/meta-amd-bsp/conf/machine/e3000.conf
+++ b/meta-amd-bsp/conf/machine/e3000.conf
@@ -34,9 +34,6 @@ DISTRO_FEATURES_remove="opengl x11 alsa pulseaudio"
MACHINEOVERRIDES =. "amd:amdx86:"
-# Metadata used by CodeBench for the ADE
-ADE_CB_CPU = "general.cpu.zen"
-
# Mask out recipes for packages we do not support for
# e3000 but require under common.
BBMASK = ".*/meta-amd/common/recipes-multimedia/mpv|.*/meta-amd/common/recipes-multimedia/v4l2apps|.*/meta-amd/common/recipes-support/libtinyxml|.*/meta-amd/common/recipes-support/numactl"
diff --git a/meta-amd-bsp/conf/machine/r1000.conf b/meta-amd-bsp/conf/machine/r1000.conf
index 955a15ae..b3ce4e40 100644
--- a/meta-amd-bsp/conf/machine/r1000.conf
+++ b/meta-amd-bsp/conf/machine/r1000.conf
@@ -41,9 +41,4 @@ SERIAL_CONSOLES ?= "115200;ttyS4 115200;ttyS5"
# Enable the kernel console on ttyS4/USB0 as well
KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
-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.zen"
diff --git a/meta-amd-bsp/conf/machine/v1000.conf b/meta-amd-bsp/conf/machine/v1000.conf
index 8ca0c51a..811d885f 100644
--- a/meta-amd-bsp/conf/machine/v1000.conf
+++ b/meta-amd-bsp/conf/machine/v1000.conf
@@ -40,9 +40,4 @@ SERIAL_CONSOLES ?= "115200;ttyS4 115200;ttyS5"
# Enable the kernel console on ttyS4/USB0 as well
KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
-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.zen"
diff --git a/meta-amd-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-amd-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 7710bdfb..646a2cea 100644
--- a/meta-amd-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-amd-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -5,7 +5,3 @@ EXTRA_OECONF_append_amd = " --enable-vdpau"
# we do not support wayland
PACKAGECONFIG_remove_amd = "wayland"
-
-# enable build with no graphics
-PACKAGECONFIG_GL_remove_mel = "${@bb.utils.contains('COMBINED_FEATURES', 'x11', '', 'gles2 egl', d)}"
-PACKAGECONFIG_remove_mel = "${@bb.utils.contains('COMBINED_FEATURES', 'x11', '', 'egl vulkan', d)}"
diff --git a/meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch b/meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch
deleted file mode 100644
index 7d16e1a4..00000000
--- a/meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-For AMD BSPs we solely rely on the pulseaudio systemd service
-to start a server. So we disable PA autospawning by default.
-
-diff --git a/src/pulse/client.conf.in2 b/src/pulse/client.conf.in
-index 17753b0..6896640 100644
---- a/src/pulse/client.conf.in2
-+++ b/src/pulse/client.conf.in
-@@ -22,7 +22,7 @@
- ; default-server =
- ; default-dbus-server =
-
--; autospawn = yes
-+autospawn = no
- ; allow-autospawn-for-root = no
- ; daemon-binary = @PA_BINARY@
- ; extra-arguments = --log-target=syslog
-
diff --git a/meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
deleted file mode 100644
index a7ef8c54..00000000
--- a/meta-amd-bsp/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend_amd := "${@bb.utils.contains_any("DISTRO", "mel mel-lite", "", "${THISDIR}/${PN}:", d)}"
-
-# Disable autospawning, so init manager can be used to control the
-# daemon deterministically
-SRC_URI_append_amd = " ${@bb.utils.contains_any("DISTRO", "mel mel-lite", "", "file://disable_autospawn_by_default.patch", d)}"