aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/conf/machine/e3000.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/conf/machine/e3000.conf')
-rw-r--r--meta-amd-bsp/conf/machine/e3000.conf31
1 files changed, 4 insertions, 27 deletions
diff --git a/meta-amd-bsp/conf/machine/e3000.conf b/meta-amd-bsp/conf/machine/e3000.conf
index 07549f82..30279e6e 100644
--- a/meta-amd-bsp/conf/machine/e3000.conf
+++ b/meta-amd-bsp/conf/machine/e3000.conf
@@ -3,21 +3,7 @@
#@DESCRIPTION: Machine configuration for e3000 systems
-PREFERRED_PROVIDER_virtual/kernel ?= "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "linux-yocto-rt", "linux-yocto", d)}"
-PREFERRED_VERSION_linux-yocto ?= "4.19%"
-PREFERRED_VERSION_linux-yocto-rt ?= "4.19%"
-
-require conf/machine/include/tune-e3000.inc
-
-# Add machine specific AMD features and feature pkgs here
-EXTRA_IMAGE_FEATURES += "amd-feature-networking"
-DPDK_PKGS_e3000 = "${@bb.utils.contains("BBFILE_COLLECTIONS", "dpdk", "dpdk dpdk-examples dpdk-test", "", d)}"
-
-include conf/machine/include/amd-common-configurations.inc
-include conf/machine/include/amd-customer-configurations.inc
-
-MACHINE_FEATURES_remove = "alsa"
-MACHINE_EXTRA_RRECOMMENDS_remove = " rtc-test alsa-utils"
+require conf/machine/include/amdx86.inc
# Setup a getty on all serial ports
SERIAL_CONSOLES = "115200;ttyS4 115200;ttyS5"
@@ -25,15 +11,6 @@ SERIAL_CONSOLES = "115200;ttyS4 115200;ttyS5"
# Enable the kernel console on ttyS4/COM0
KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
-# Disable the graphical console, no graphics support for now
-# this allows the serial console to be used for installation
-APPEND_remove="console=tty0"
-
-# Drop features we do not need
-DISTRO_FEATURES_remove="opengl x11 alsa pulseaudio"
-
-MACHINEOVERRIDES =. "amd:amdx86:"
-
-# 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"
+# Add machine specific AMD features and feature pkgs here
+EXTRA_IMAGE_FEATURES += "amd-feature-networking"
+DPDK_PKGS = "${@bb.utils.contains("BBFILE_COLLECTIONS", "dpdk", "dpdk dpdk-examples dpdk-test", "", d)}"