From dfabd49c1f6c2be8b38bdb671b98793bbf2170af Mon Sep 17 00:00:00 2001 From: Chan Wei Sern Date: Fri, 18 Jul 2014 15:21:31 +0800 Subject: meta-crystalforest: Merge machine conf 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 Signed-off-by: Chang Rebecca Swee Fun Signed-off-by: Tom Zanussi --- .../conf/machine/crystalforest-gladden.conf | 33 ------------------ .../conf/machine/crystalforest-server.conf | 33 ------------------ meta-crystalforest/conf/machine/crystalforest.conf | 40 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 66 deletions(-) delete mode 100644 meta-crystalforest/conf/machine/crystalforest-gladden.conf delete mode 100644 meta-crystalforest/conf/machine/crystalforest-server.conf create mode 100644 meta-crystalforest/conf/machine/crystalforest.conf (limited to 'meta-crystalforest') diff --git a/meta-crystalforest/conf/machine/crystalforest-gladden.conf b/meta-crystalforest/conf/machine/crystalforest-gladden.conf deleted file mode 100644 index 9c332938..00000000 --- a/meta-crystalforest/conf/machine/crystalforest-gladden.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: crystalforest-gladden - -#@WEBTITLE: Intel Xeon E3-1125C/E3-1105C (Formerly Sandy Bridge-Gladden) -#Processors with Intel Communication Chipset 89xx (Crystal Forest Gladden Platform) - -#@DESCRIPTION: Machine configuration for Crystal Forest Gladden systems -#for Smaller Form Factor Communication Infrastructure -# i.e. Xeon E3-1125C/E3-1105C + Intel 89xx communication Chipset - -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" diff --git a/meta-crystalforest/conf/machine/crystalforest-server.conf b/meta-crystalforest/conf/machine/crystalforest-server.conf deleted file mode 100644 index fd0e80a3..00000000 --- a/meta-crystalforest/conf/machine/crystalforest-server.conf +++ /dev/null @@ -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" diff --git a/meta-crystalforest/conf/machine/crystalforest.conf b/meta-crystalforest/conf/machine/crystalforest.conf new file mode 100644 index 00000000..44b9bb2d --- /dev/null +++ b/meta-crystalforest/conf/machine/crystalforest.conf @@ -0,0 +1,40 @@ +#@TYPE: Machine +#@NAME: crystalforest + +#@WEBTITLE: Intel Xeon E3-1125C/E3-1105C (Formerly Sandy Bridge-Gladden) +#Processors with Intel Communication Chipset 89xx (Crystal Forest Gladden Platform) + +#@DESCRIPTION: Machine configuration for Crystal Forest Gladden systems +#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%" + +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" -- cgit v1.2.3-54-g00ecf