MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

meta-crystalforest: Merge machine conf

Browse Source 
Machine configuration for both crystalforest-gladden and
crystalforest-server platforms are sharing similiar settings.
This patch is to merge the machine conf by creating one machine
configuration file namely crystalforest.conf.

Signed-off-by: Chan Wei Sern <wei.sern.chan@intel.com>
Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Acked By: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
This commit is contained in:
Chan Wei Sern 2014-07-18 15:21:31 +08:00 committed by Tom Zanussi
parent 538003074d
commit 2163956d6c
2 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-crystalforest/conf/machine/crystalforest-server.conf
View File

@ -1,33 +0,0 @@
#@TYPE: Machine
#@NAME: crystalforest-server
#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 (Formerly Sandy Bridge-EP/EN)
#Processors with Intel Communication Chipset 89xx (Crystal Forest Server Platform)
#@DESCRIPTION: Machine configuration for Crystal Forest Server systems
#for Large-Scale Communications Infrastructure
# i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_VERSION_linux-yocto ?= "3.10%"
require conf/machine/include/intel-corei7-64-common.inc
require conf/machine/include/intel-common-pkgarch.inc
require conf/machine/include/meta-intel.inc
XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
${XSERVER_X86_MATROX_MGA} \
"
MACHINE_EXTRA_RRECOMMENDS += "calgary-corpus \
canterbury-corpus \
"
#This Kernel Option is required for Intel Quick Assist Technology Software.
APPEND += "acpi_enforce_resources=lax"
#Uncomment the below Kernel Option if Virtualization is not needed.
#APPEND += "intel_iommu=off"
SYSLINUX_OPTS = "serial 0 115200"
SERIAL_CONSOLE = "115200 ttyS0"
APPEND += "console=ttyS0,115200 console=tty0"

13
meta-crystalforest/conf/machine/crystalforest-gladden.conf → meta-crystalforest/conf/machine/crystalforest.conf
View File

@ -1,5 +1,5 @@
#@TYPE: Machine
#@NAME: crystalforest-gladden
#@NAME: crystalforest
#@WEBTITLE: Intel Xeon E3-1125C/E3-1105C (Formerly Sandy Bridge-Gladden)
#Processors with Intel Communication Chipset 89xx (Crystal Forest Gladden Platform)
@ -8,6 +8,13 @@
#for Smaller Form Factor Communication Infrastructure
# i.e. Xeon E3-1125C/E3-1105C + Intel 89xx communication Chipset
#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 (Formerly Sandy Bridge-EP/EN)
#Processors with Intel Communication Chipset 89xx (Crystal Forest Server Platform)
#@DESCRIPTION: Machine configuration for Crystal Forest Server systems
#for Large-Scale Communications Infrastructure
# i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_VERSION_linux-yocto ?= "3.10%"
@ -16,12 +23,12 @@ require conf/machine/include/intel-common-pkgarch.inc
require conf/machine/include/meta-intel.inc
XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_EXT} \
${XSERVER_X86_EXT} \
${XSERVER_X86_MATROX_MGA} \
"
MACHINE_EXTRA_RRECOMMENDS += "calgary-corpus \
canterbury-corpus \
"
"
#This Kernel Option is required for Intel Quick Assist Technology Software.
APPEND += "acpi_enforce_resources=lax"