summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/intel-common-pkgarch.inc15
-rw-r--r--conf/machine/include/intel-core2-32-common.inc7
-rw-r--r--conf/machine/include/intel-corei7-64-common.inc7
-rw-r--r--conf/machine/include/intel-quark-common.inc12
-rw-r--r--conf/machine/include/meta-intel.inc52
-rw-r--r--conf/machine/include/qemu-intel.inc19
-rw-r--r--conf/machine/include/qemuboot-intel.inc19
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 d0f208b..0000000
--- a/conf/machine/include/intel-common-pkgarch.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common"
2PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}"
3PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
4PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
5PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
6PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}"
7PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}"
8PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}"
9PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}"
10PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}"
11PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}"
12PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}"
13PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}"
14PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}"
15MACHINEOVERRIDES =. "${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 8c46949..0000000
--- a/conf/machine/include/intel-core2-32-common.inc
+++ /dev/null
@@ -1,7 +0,0 @@
1#
2# Common configuration for all MACHINEs of the intel-core2 type
3#
4
5DEFAULTTUNE ?= "core2-32"
6require conf/machine/include/tune-core2.inc
7require 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 0028256..0000000
--- a/conf/machine/include/intel-corei7-64-common.inc
+++ /dev/null
@@ -1,7 +0,0 @@
1#
2# Common configuration for all MACHINES of the intel-corei7-64 type
3#
4
5DEFAULTTUNE ?= "corei7-64"
6require conf/machine/include/tune-corei7.inc
7require 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 f7cfe14..0000000
--- a/conf/machine/include/intel-quark-common.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1#
2# Common configuration for all MACHINES of the intel-quark type
3#
4
5DEFAULTTUNE ?= "i586-nlp-32"
6require conf/machine/include/tune-i586-nlp.inc
7require conf/machine/include/x86-base.inc
8
9# gnutls padlock code uses CMOV instruction in assembly which
10# is not valid for Quark.
11EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock"
12EXTRA_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 34a672c..0000000
--- a/conf/machine/include/meta-intel.inc
+++ /dev/null
@@ -1,52 +0,0 @@
1#
2# BSP variables and settings specific to the meta-intel layer.
3# You must include the meta-intel layer in your bblayers.conf
4# to use them.
5#
6
7#
8# XSERVER subcomponents, used to build the XSERVER variable
9#
10
11# Soft set linux-yocto as preferred kernel like x86-base.inc
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
13PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel"
14PREFERRED_PROVIDER_virtual/kernel_linuxstdbase ?= "linux-yocto"
15PREFERRED_VERSION_linux-intel ?= "4.9%"
16
17# for Xserver older than 1.13.0
18OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
19 xserver-xorg-extension-dri2 \
20 xserver-xorg-extension-extmod \
21 xserver-xorg-extension-dbe \
22 "
23
24XSERVER_X86_MATROX_MGA = "xf86-video-mga \
25 "
26
27XSERVER_X86_ASPEED_AST = "xf86-video-ast \
28 "
29
30# include the user space intel microcode loading support in the generated images.
31MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)} thermald"
32
33# recommended extra packages common to all intel machines
34MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware"
35
36# for the early boot time kernel microcode loading support,
37# merge the microcode data in the final initrd image.
38INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
39
40DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef"
41
42EFI_PROVIDER ?= "rmc-boot"
43
44# Add general MACHINEOVERRIDE for meta-intel
45MACHINEOVERRIDES =. "intel-x86-common:"
46
47# Definition of (more or less) suitable virtual machines.
48require conf/machine/include/qemuboot-intel.inc
49
50# Ensure that the extra tools needed by qemu are built when building images
51# and tweak machine definition to make the result more usable under qemu.
52require 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 8151040..0000000
--- a/conf/machine/include/qemu-intel.inc
+++ /dev/null
@@ -1,19 +0,0 @@
1# Similar to meta/conf/machine/include/qemu.inc but influences the
2# distro content (in particular the kernel) less than qemu.inc.
3
4# Ensure that qemu gets built when building images.
5EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
6
7# Build ovmf firmware for uefi support in qemu.
8EXTRA_IMAGEDEPENDS += "ovmf"
9
10# runqemu uses virtio, so we have to enable the corresponding
11# kernel drivers.
12KERNEL_FEATURES_INTEL_COMMON += "cfg/virtio.scc"
13
14# Other useful extensions which are not enabled by default:
15# rng-tools to take advantage of qemu's virtio-rng-pci device.
16# MACHINE_EXTRA_RRECOMMENDS += "rng-tools"
17
18# Creates the necessary .qemuboot.conf file for each image.
19IMAGE_CLASSES += "qemuboot"
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
deleted file mode 100644
index cb52330..0000000
--- a/conf/machine/include/qemuboot-intel.inc
+++ /dev/null
@@ -1,19 +0,0 @@
1# For runqemu
2IMAGE_CLASSES += "qemuboot"
3QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386"
4QB_CPU_intel-core2-32 = "-cpu coreduo"
5QB_CPU_KVM_intel-core2-32 = "-cpu kvm32"
6
7QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64"
8QB_CPU_intel-corei7-64 = "-cpu Nehalem"
9QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64"
10
11QB_SYSTEM_NAME_intel-quark = "qemu-system-i386"
12QB_CPU_intel-quark = "-cpu coreduo"
13QB_CPU_KVM_intel-quark = "-cpu kvm32"
14
15QB_AUDIO_DRV = "alsa"
16QB_AUDIO_OPT = "-soundhw ac97,es1370"
17QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
18# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
19QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci"