7 files changed, 0 insertions, 131 deletions
diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc
deleted file mode 100644
index d0f208bd..00000000
--- a/conf/machine/include/intel-common-pkgarch.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common"
-PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
-PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}"
-MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:"
diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc
deleted file mode 100644
index 8c469499..00000000
--- a/conf/machine/include/intel-core2-32-common.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Common configuration for all MACHINEs of the intel-core2 type
-#
-
-DEFAULTTUNE ?= "core2-32"
-require conf/machine/include/tune-core2.inc
-require conf/machine/include/x86-base.inc
diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc
deleted file mode 100644
index 00282569..00000000
--- a/conf/machine/include/intel-corei7-64-common.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Common configuration for all MACHINES of the intel-corei7-64 type
-#
-
-DEFAULTTUNE ?= "corei7-64"
-require conf/machine/include/tune-corei7.inc
-require conf/machine/include/x86-base.inc
diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc
deleted file mode 100644
index f7cfe146..00000000
--- a/conf/machine/include/intel-quark-common.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Common configuration for all MACHINES of the intel-quark type
-#
-
-DEFAULTTUNE ?= "i586-nlp-32"
-require conf/machine/include/tune-i586-nlp.inc
-require conf/machine/include/x86-base.inc
-
-# gnutls padlock code uses CMOV instruction in assembly which
-# is not valid for Quark.
-EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock"
-EXTRA_OECONF_append_pn-openssl_intel-quark = " no-asm" 
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
deleted file mode 100644
index 34a672c0..00000000
--- a/conf/machine/include/meta-intel.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# BSP variables and settings specific to the meta-intel layer.
-# You must include the meta-intel layer in your bblayers.conf
-# to use them.
-#
-
-#
-# XSERVER subcomponents, used to build the XSERVER variable
-#
-
-# 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_PROVIDER_virtual/kernel_linuxstdbase ?= "linux-yocto"
-PREFERRED_VERSION_linux-intel ?= "4.9%"
-
-# for Xserver older than 1.13.0
-OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-extmod \
-           xserver-xorg-extension-dbe \
-           "
-
-XSERVER_X86_MATROX_MGA = "xf86-video-mga \
-           "
-
-XSERVER_X86_ASPEED_AST = "xf86-video-ast \
-           "
-
-# 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)} thermald"
-
-# recommended extra packages common to all intel machines
-MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware"
-
-# for the early boot time kernel microcode loading support,
-# merge the microcode data in the final initrd image.
-INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
-
-DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef"
-
-EFI_PROVIDER ?= "rmc-boot"
-
-# Add general MACHINEOVERRIDE for meta-intel
-MACHINEOVERRIDES =. "intel-x86-common:"
-
-# Definition of (more or less) suitable virtual machines.
-require conf/machine/include/qemuboot-intel.inc
-
-# Ensure that the extra tools needed by qemu are built when building images
-# and tweak machine definition to make the result more usable under qemu.
-require conf/machine/include/qemu-intel.inc
diff --git a/conf/machine/include/qemu-intel.inc b/conf/machine/include/qemu-intel.inc
deleted file mode 100644
index 81510404..00000000
--- a/conf/machine/include/qemu-intel.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Similar to meta/conf/machine/include/qemu.inc but influences the
-# distro content (in particular the kernel) less than qemu.inc.
-
-# Ensure that qemu gets built when building images.
-EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
-
-# Build ovmf firmware for uefi support in qemu.
-EXTRA_IMAGEDEPENDS += "ovmf"
-
-# runqemu uses virtio, so we have to enable the corresponding
-# kernel drivers.
-KERNEL_FEATURES_INTEL_COMMON += "cfg/virtio.scc"
-
-# Other useful extensions which are not enabled by default:
-# rng-tools to take advantage of qemu's virtio-rng-pci device.
-# MACHINE_EXTRA_RRECOMMENDS += "rng-tools"
-
-# Creates the necessary .qemuboot.conf file for each image.
-IMAGE_CLASSES += "qemuboot"
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
deleted file mode 100644
index cb52330b..00000000
--- a/conf/machine/include/qemuboot-intel.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# For runqemu
-IMAGE_CLASSES += "qemuboot"
-QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386"
-QB_CPU_intel-core2-32 = "-cpu coreduo"
-QB_CPU_KVM_intel-core2-32 = "-cpu kvm32"
-
-QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64"
-QB_CPU_intel-corei7-64 = "-cpu Nehalem"
-QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64"
-
-QB_SYSTEM_NAME_intel-quark = "qemu-system-i386"
-QB_CPU_intel-quark = "-cpu coreduo"
-QB_CPU_KVM_intel-quark = "-cpu kvm32"
-
-QB_AUDIO_DRV = "alsa"
-QB_AUDIO_OPT = "-soundhw ac97,es1370"
-QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
-# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
-QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"