summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-crystalforest/conf/machine/crystalforest-server.conf33
-rw-r--r--meta-crystalforest/conf/machine/crystalforest.conf (renamed from meta-crystalforest/conf/machine/crystalforest-gladden.conf)13
2 files changed, 10 insertions, 36 deletions
diff --git a/meta-crystalforest/conf/machine/crystalforest-server.conf b/meta-crystalforest/conf/machine/crystalforest-server.conf
deleted file mode 100644
index fd0e80a..0000000
--- a/meta-crystalforest/conf/machine/crystalforest-server.conf
+++ /dev/null
@@ -1,33 +0,0 @@
1#@TYPE: Machine
2#@NAME: crystalforest-server
3
4#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 (Formerly Sandy Bridge-EP/EN)
5#Processors with Intel Communication Chipset 89xx (Crystal Forest Server Platform)
6
7#@DESCRIPTION: Machine configuration for Crystal Forest Server systems
8#for Large-Scale Communications Infrastructure
9# i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets
10
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
12PREFERRED_VERSION_linux-yocto ?= "3.10%"
13
14require conf/machine/include/intel-corei7-64-common.inc
15require conf/machine/include/intel-common-pkgarch.inc
16require conf/machine/include/meta-intel.inc
17
18XSERVER ?= "${XSERVER_X86_BASE} \
19 ${XSERVER_X86_EXT} \
20 ${XSERVER_X86_MATROX_MGA} \
21 "
22MACHINE_EXTRA_RRECOMMENDS += "calgary-corpus \
23 canterbury-corpus \
24 "
25#This Kernel Option is required for Intel Quick Assist Technology Software.
26APPEND += "acpi_enforce_resources=lax"
27
28#Uncomment the below Kernel Option if Virtualization is not needed.
29#APPEND += "intel_iommu=off"
30
31SYSLINUX_OPTS = "serial 0 115200"
32SERIAL_CONSOLE = "115200 ttyS0"
33APPEND += "console=ttyS0,115200 console=tty0"
diff --git a/meta-crystalforest/conf/machine/crystalforest-gladden.conf b/meta-crystalforest/conf/machine/crystalforest.conf
index 9c33293..44b9bb2 100644
--- a/meta-crystalforest/conf/machine/crystalforest-gladden.conf
+++ b/meta-crystalforest/conf/machine/crystalforest.conf
@@ -1,5 +1,5 @@
1#@TYPE: Machine 1#@TYPE: Machine
2#@NAME: crystalforest-gladden 2#@NAME: crystalforest
3 3
4#@WEBTITLE: Intel Xeon E3-1125C/E3-1105C (Formerly Sandy Bridge-Gladden) 4#@WEBTITLE: Intel Xeon E3-1125C/E3-1105C (Formerly Sandy Bridge-Gladden)
5#Processors with Intel Communication Chipset 89xx (Crystal Forest Gladden Platform) 5#Processors with Intel Communication Chipset 89xx (Crystal Forest Gladden Platform)
@@ -8,6 +8,13 @@
8#for Smaller Form Factor Communication Infrastructure 8#for Smaller Form Factor Communication Infrastructure
9# i.e. Xeon E3-1125C/E3-1105C + Intel 89xx communication Chipset 9# i.e. Xeon E3-1125C/E3-1105C + Intel 89xx communication Chipset
10 10
11#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 (Formerly Sandy Bridge-EP/EN)
12#Processors with Intel Communication Chipset 89xx (Crystal Forest Server Platform)
13
14#@DESCRIPTION: Machine configuration for Crystal Forest Server systems
15#for Large-Scale Communications Infrastructure
16# i.e. Xeon E5-2600 and E5-2400 + Intel 89xx Communication Chipsets
17
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 18PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
12PREFERRED_VERSION_linux-yocto ?= "3.10%" 19PREFERRED_VERSION_linux-yocto ?= "3.10%"
13 20
@@ -16,12 +23,12 @@ require conf/machine/include/intel-common-pkgarch.inc
16require conf/machine/include/meta-intel.inc 23require conf/machine/include/meta-intel.inc
17 24
18XSERVER ?= "${XSERVER_X86_BASE} \ 25XSERVER ?= "${XSERVER_X86_BASE} \
19 ${XSERVER_X86_EXT} \ 26 ${XSERVER_X86_EXT} \
20 ${XSERVER_X86_MATROX_MGA} \ 27 ${XSERVER_X86_MATROX_MGA} \
21 " 28 "
22MACHINE_EXTRA_RRECOMMENDS += "calgary-corpus \ 29MACHINE_EXTRA_RRECOMMENDS += "calgary-corpus \
23 canterbury-corpus \ 30 canterbury-corpus \
24 " 31 "
25#This Kernel Option is required for Intel Quick Assist Technology Software. 32#This Kernel Option is required for Intel Quick Assist Technology Software.
26APPEND += "acpi_enforce_resources=lax" 33APPEND += "acpi_enforce_resources=lax"
27 34