Merge remote-tracking branch 'origin/master' into master-enea

1 files changed, 0 insertions, 36 deletions

diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
deleted file mode 100644
index bdf4b0dd..00000000
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#@TYPE: Machine
-#@NAME: fri2
-
-#@WEBTITLE: Intel Atom E640T Processor with Intel EG20T Controller Hub Development Kit (Queens Bay) with Open Source VESA Graphics for Fish River Island II systems
-
-#@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits
-
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-require conf/machine/include/meta-intel.inc
-
-MACHINE_FEATURES += "wifi 3g pcbios efi"
-MACHINE_FEATURES += "intel-ucode"
-
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_FBDEV} \
-           "
-
-# Syslinux does not know about the 64MHz uart clock and it does not detect the
-# serial device by number. Use the IO port directly and divide the baud down to
-# trick syslinux into configuring a 115200 baud.
-SYSLINUX_OPTS = "serial 0xb060 3318"
-SERIAL_CONSOLE = "115200 ttyPCH1"
-APPEND += "console=ttyPCH1,115200 console=tty0"
-
-# EFI boot will ignore this and use the EFI framebuffer at 800x600
-APPEND += "video=vesafb vga=0x318"
-
-# MSI interrupts fail for the HDA device when using the EFI firmware
-APPEND += "snd_hda_intel.enable_msi=0"