1 files changed, 6 insertions, 14 deletions

diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 9467d090..968395fe 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -8,22 +8,14 @@ require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
 MACHINE_FEATURES += "pcbios efi"
-MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
-
-MACHINE_EXTRA_RRECOMMENDS += "lms8"
+MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi"
 
 # Enable optional dpdk:
-COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64"
-COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64"
-
-# Enable optional QAT items:
-COMPATIBLE_MACHINE_pn-openssl-qat = "intel-corei7-64"
-COMPATIBLE_MACHINE_pn-qat16 = "intel-corei7-64"
-COMPATIBLE_MACHINE_pn-zlib-qat = "intel-corei7-64"
+COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64"
+COMPATIBLE_MACHINE:pn-dpdk-module = "intel-corei7-64"
 
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
@@ -36,9 +28,9 @@ XSERVER ?= "${XSERVER_X86_BASE} \
            "
 
 SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyS2"
 APPEND += "rootwait console=ttyS0,115200 console=tty0"
 
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk-microcode.wks", "mkefidisk.wks", d)}"
-WKS_FILE_DEPENDS_append = " intel-microcode"
+WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
+WKS_FILE_DEPENDS:append = " intel-microcode"