inteld1521: re-define machine configuration

Replace default corei7 inherited machine configuration with
a clean-up version suitable for Enea Linux.
Mainly removed qemu specific configuration since this is a machine
used for host and extra/unused features like: core-image-minimal and
rmc tool.

Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

1 files changed, 40 insertions, 1 deletions

diff --git a/conf/machine/inteld1521.conf b/conf/machine/inteld1521.conf
index 1203dbe..091ef18 100644
--- a/conf/machine/inteld1521.conf
+++ b/conf/machine/inteld1521.conf
@@ -3,4 +3,43 @@
 #@SUMMARY: Intel Xeon D1521
 #@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
 
-require conf/machine/intel-corei7-64.conf
+# This is a clean-up version of conf/machine/intel-corei7-64.conf
+# If the configuration need to be updated please check first the original .conf
+
+# Soft set linux-yocto as preferred kernel like x86-base.inc
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
+PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel"
+PREFERRED_VERSION_linux-intel ?= "4.9%"
+
+# include the user space intel microcode loading support in the generated images.
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}"
+
+# Add general MACHINEOVERRIDE for meta-intel
+MACHINEOVERRIDES =. "intel-x86-common:"
+
+require conf/machine/include/intel-corei7-64-common.inc
+require conf/machine/include/intel-common-pkgarch.inc
+
+MACHINE_FEATURES += "pcbios efi"
+MACHINE_FEATURES += "intel-ucode"
+
+MACHINE_EXTRA_RRECOMMENDS += "lms8"
+
+XSERVER_X86_MATROX_MGA = "xf86-video-mga \
+           "
+XSERVER_X86_ASPEED_AST = "xf86-video-ast \
+           "
+XSERVER ?= "${XSERVER_X86_BASE} \
+            ${XSERVER_X86_EXT} \
+            ${XSERVER_X86_FBDEV} \
+            ${XSERVER_X86_I915} \
+            ${XSERVER_X86_I965} \
+            ${XSERVER_X86_MATROX_MGA} \
+            ${XSERVER_X86_MODESETTING} \
+            ${XSERVER_X86_VESA} \
+            ${XSERVER_X86_ASPEED_AST} \
+           "
+
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
+APPEND += "rootwait console=ttyS0,115200 console=tty0"