From 0863d731696fef57d356346635980259649a3e33 Mon Sep 17 00:00:00 2001 From: Kishore Bodke Date: Mon, 29 Oct 2012 10:23:47 -0700 Subject: crystalforest: Change the machine names Change the Machine names for the two machines that will be used to publish the BSP on the Yocto Project website. And add the Yocto Project Compliance information for the 1.3 release. Signed-off-by: Kishore Bodke Signed-off-by: Tom Zanussi --- meta-crystalforest/README | 26 ++++++++++----------- .../conf/machine/crystalforest-gladden.conf | 27 ++++++++++++++++++++++ .../conf/machine/crystalforest-server.conf | 26 +++++++++++++++++++++ .../conf/machine/crystalforest-shumway.conf | 26 --------------------- .../conf/machine/crystalforest-stargo.conf | 27 ---------------------- .../formfactor/crystalforest-gladden/machconfig | 3 +++ .../formfactor/crystalforest-server/machconfig | 3 +++ .../formfactor/crystalforest-shumway/machconfig | 3 --- .../formfactor/crystalforest-stargo/machconfig | 3 --- .../crystalforest-gladden/xorg.conf | 26 +++++++++++++++++++++ .../crystalforest-server/xorg.conf | 26 +++++++++++++++++++++ .../crystalforest-shumway/xorg.conf | 26 --------------------- .../crystalforest-stargo/xorg.conf | 26 --------------------- .../linux/linux-yocto-rt_3.4.bbappend | 21 ++++++++--------- .../recipes-kernel/linux/linux-yocto_3.4.bbappend | 20 ++++++++-------- 15 files changed, 143 insertions(+), 146 deletions(-) create mode 100644 meta-crystalforest/conf/machine/crystalforest-gladden.conf create mode 100644 meta-crystalforest/conf/machine/crystalforest-server.conf delete mode 100644 meta-crystalforest/conf/machine/crystalforest-shumway.conf delete mode 100644 meta-crystalforest/conf/machine/crystalforest-stargo.conf create mode 100644 meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig create mode 100644 meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig delete mode 100644 meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-shumway/machconfig delete mode 100644 meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-stargo/machconfig create mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf create mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-shumway/xorg.conf delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-stargo/xorg.conf (limited to 'meta-crystalforest') diff --git a/meta-crystalforest/README b/meta-crystalforest/README index 7b88b224..2a25edce 100644 --- a/meta-crystalforest/README +++ b/meta-crystalforest/README @@ -3,11 +3,11 @@ BSP layer, and booting the images contained in the /binary directory. Please see the corresponding sections below for details. The 'Crystal Forest' platform consists of two versions. -1. STARGO -2. SHUMWAY +1. GLADDEN +2. SERVER -Stargo Platform is based on Intel Sandy Bridge Gladden Processor,plus the Cave Creek chipset. -Shumway Platform is based on two Intel Sandy Bridge (SNB-EP ES2 Grade and SNB-EN ES2 Grade) +Gladden Platform is based on Intel Sandy Bridge Gladden Processor,plus the Cave Creek chipset. +Server Platform is based on two Intel Sandy Bridge (SNB-EP ES2 Grade and SNB-EN ES2 Grade) Processors plus two Cave Creek Chipsets. Both Platforms uses Matrox graphics Card. @@ -64,13 +64,13 @@ common metadata shared between BSPs) e.g.: yocto/meta-intel \ yocto/meta-intel/meta-crystalforest \ -To enable the Crystal Forest Stargo layer, add the crystalforest-stargo MACHINE to local.conf: +To enable the Crystal Forest Gladden layer, add the crystalforest-gladden MACHINE to local.conf: - MACHINE ?= "crystalforest-stargo" + MACHINE ?= "crystalforest-gladden" -To enable the Crystal Forest Shumway layer, add the crystalforest-shumway MACHINE to local.conf: +To enable the Crystal Forest Server layer, add the crystalforest-server MACHINE to local.conf: - MACHINE ?= "crystalforest-shumway" + MACHINE ?= "crystalforest-server" You should then be able to build a crystalforest image as such: @@ -103,15 +103,15 @@ Under Linux, insert a USB flash drive. Assuming the USB flash drive takes device /dev/sdf, use dd to copy the live image to it. For example: -To boot the Stargo Platform: +To boot the Gladden Platform: -# dd if=core-image-sato-crystalforest-stargo-20120829033154.hddimg of=/dev/sdf +# dd if=core-image-sato-crystalforest-gladden-20120829033154.hddimg of=/dev/sdf # sync # eject /dev/sdf -To boot the Shumway Platform: +To boot the Server Platform: -# dd if=core-image-sato-crystalforest-shumway-20120829044852.hddimg of=/dev/sdf +# dd if=core-image-sato-crystalforest-server-20120829044852.hddimg of=/dev/sdf # sync # eject /dev/sdf @@ -135,5 +135,3 @@ the syslinux boot: prompt, or the boot: prompt contains strange characters), try doing this first: # dd if=/dev/zero of=/dev/sdf bs=1M count=512 - - diff --git a/meta-crystalforest/conf/machine/crystalforest-gladden.conf b/meta-crystalforest/conf/machine/crystalforest-gladden.conf new file mode 100644 index 00000000..a84088aa --- /dev/null +++ b/meta-crystalforest/conf/machine/crystalforest-gladden.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@NAME: crystalforest-gladden + +#@DESCRIPTION: Machine configuration for Crystal Forest (GLADDEN) systems +# i.e. One Sandy Bridge based Gladden Processor + One Cave Creek Chipset + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.4%" + +require conf/machine/include/tune-x86_64.inc +require conf/machine/include/ia32-base.inc +require conf/machine/include/meta-intel.inc + +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_MATROX_MGA} \ + " + +#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 new file mode 100644 index 00000000..2bbc4f31 --- /dev/null +++ b/meta-crystalforest/conf/machine/crystalforest-server.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: crystalforest-server + +#@DESCRIPTION: Machine configuration for Crystal Forest Server systems +# i.e. Two Sandy Bridge Jaketown processors (SNB-EP ES2 Grade and SNB-EN ES2 Grade) + Two Cave Creek Chipsets. + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.4%" + +require conf/machine/include/tune-x86_64.inc +require conf/machine/include/ia32-base.inc +require conf/machine/include/meta-intel.inc + +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_MATROX_MGA} \ + " +#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-shumway.conf b/meta-crystalforest/conf/machine/crystalforest-shumway.conf deleted file mode 100644 index 0a2141c8..00000000 --- a/meta-crystalforest/conf/machine/crystalforest-shumway.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine -#@NAME: crystalforest-shumway - -#@DESCRIPTION: Machine configuration for Crystal Forest Server (SHUMWAY) systems -# i.e. Two Sandy Bridge Jaketown processors (SNB-EP ES2 Grade and SNB-EN ES2 Grade) + Two Cave Creek Chipsets. - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.4%" - -require conf/machine/include/tune-x86_64.inc -require conf/machine/include/ia32-base.inc -require conf/machine/include/meta-intel.inc - -XSERVER ?= "${XSERVER_IA32_BASE} \ - ${XSERVER_IA32_EXT} \ - ${XSERVER_IA32_MATROX_MGA} \ - " -#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-stargo.conf b/meta-crystalforest/conf/machine/crystalforest-stargo.conf deleted file mode 100644 index 575a504d..00000000 --- a/meta-crystalforest/conf/machine/crystalforest-stargo.conf +++ /dev/null @@ -1,27 +0,0 @@ -#@TYPE: Machine -#@NAME: crystalforest-stargo - -#@DESCRIPTION: Machine configuration for Crystal Forest (STARGO) systems -# i.e. One Sandy Bridge based Gladden Processor + One Cave Creek Chipset - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.4%" - -require conf/machine/include/tune-x86_64.inc -require conf/machine/include/ia32-base.inc -require conf/machine/include/meta-intel.inc - -XSERVER ?= "${XSERVER_IA32_BASE} \ - ${XSERVER_IA32_EXT} \ - ${XSERVER_IA32_MATROX_MGA} \ - " - -#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/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig b/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig new file mode 100644 index 00000000..ffce0122 --- /dev/null +++ b/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig @@ -0,0 +1,3 @@ +# Assume a USB mouse and keyboard are connected +HAVE_TOUCHSCREEN=0 +HAVE_KEYBOARD=1 diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig b/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig new file mode 100644 index 00000000..ffce0122 --- /dev/null +++ b/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig @@ -0,0 +1,3 @@ +# Assume a USB mouse and keyboard are connected +HAVE_TOUCHSCREEN=0 +HAVE_KEYBOARD=1 diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-shumway/machconfig b/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-shumway/machconfig deleted file mode 100644 index ffce0122..00000000 --- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-shumway/machconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Assume a USB mouse and keyboard are connected -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=1 diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-stargo/machconfig b/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-stargo/machconfig deleted file mode 100644 index ffce0122..00000000 --- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-stargo/machconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Assume a USB mouse and keyboard are connected -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=1 diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf new file mode 100644 index 00000000..28ad0bf7 --- /dev/null +++ b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf @@ -0,0 +1,26 @@ +Section "Device" + Identifier "Matrox MGA" + Driver "mga" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Matrox MGA" + Monitor "Generic Monitor" + DefaultDepth 24 +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" +EndSection + +Section "ServerFlags" + Option "DontZap" "0" + Option "AutoAddDevices" "False" +EndSection diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf new file mode 100644 index 00000000..28ad0bf7 --- /dev/null +++ b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf @@ -0,0 +1,26 @@ +Section "Device" + Identifier "Matrox MGA" + Driver "mga" +EndSection + +Section "Monitor" + Identifier "Generic Monitor" + Option "DPMS" +EndSection + +Section "Screen" + Identifier "Default Screen" + Device "Matrox MGA" + Monitor "Generic Monitor" + DefaultDepth 24 +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" +EndSection + +Section "ServerFlags" + Option "DontZap" "0" + Option "AutoAddDevices" "False" +EndSection diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-shumway/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-shumway/xorg.conf deleted file mode 100644 index 28ad0bf7..00000000 --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-shumway/xorg.conf +++ /dev/null @@ -1,26 +0,0 @@ -Section "Device" - Identifier "Matrox MGA" - Driver "mga" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Matrox MGA" - Monitor "Generic Monitor" - DefaultDepth 24 -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" -EndSection - -Section "ServerFlags" - Option "DontZap" "0" - Option "AutoAddDevices" "False" -EndSection diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-stargo/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-stargo/xorg.conf deleted file mode 100644 index 28ad0bf7..00000000 --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-stargo/xorg.conf +++ /dev/null @@ -1,26 +0,0 @@ -Section "Device" - Identifier "Matrox MGA" - Driver "mga" -EndSection - -Section "Monitor" - Identifier "Generic Monitor" - Option "DPMS" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Matrox MGA" - Monitor "Generic Monitor" - DefaultDepth 24 -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" -EndSection - -Section "ServerFlags" - Option "DontZap" "0" - Option "AutoAddDevices" "False" -EndSection diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend index 240ba2fa..1295b850 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend @@ -1,18 +1,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_crystalforest-stargo = "crystalforest-stargo" -KMACHINE_crystalforest-stargo = "crystalforest" -KBRANCH_crystalforest-stargo = "standard/preempt-rt/base" +COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladen" +KMACHINE_crystalforest-gladden = "crystalforest" +KBRANCH_crystalforest-gladden = "standard/preempt-rt/base" -SRCREV_machine_pn-linux-yocto-rt_crystalforest-stargo ?= "9032b1e9daf5b4396f939981c3be95f67802d18c" -SRCREV_meta_pn-linux-yocto-rt_crystalforest-stargo ?= "9e3bdb7344054264b750e53fbbb6394cc1c942ac" +SRCREV_machine_pn-linux-yocto-rt_crystalforest-gladden ?= "9032b1e9daf5b4396f939981c3be95f67802d18c" +SRCREV_meta_pn-linux-yocto-rt_crystalforest-gladden ?= "9e3bdb7344054264b750e53fbbb6394cc1c942ac" +COMPATIBLE_MACHINE_crystalforest-server = "crystalforest-server" +KMACHINE_crystalforest-server = "crystalforest" +KBRANCH_crystalforest-server = "standard/preempt-rt/base" -COMPATIBLE_MACHINE_crystalforest-shumway = "crystalforest-shumway" -KMACHINE_crystalforest-shumway = "crystalforest" -KBRANCH_crystalforest-shumway = "standard/preempt-rt/base" - -SRCREV_machine_pn-linux-yocto-rt_crystalforest-shumway ?= "9032b1e9daf5b4396f939981c3be95f67802d18c" -SRCREV_meta_pn-linux-yocto-rt_crystalforest-shumway ?= "9e3bdb7344054264b750e53fbbb6394cc1c942ac" +SRCREV_machine_pn-linux-yocto-rt_crystalforest-server ?= "9032b1e9daf5b4396f939981c3be95f67802d18c" +SRCREV_meta_pn-linux-yocto-rt_crystalforest-server ?= "9e3bdb7344054264b750e53fbbb6394cc1c942ac" module_autoload_uio = "uio" diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend index a065abae..84183077 100644 --- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -1,17 +1,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_crystalforest-stargo = "crystalforest-stargo" -KMACHINE_crystalforest-stargo = "crystalforest" -KBRANCH_crystalforest-stargo = "standard/common-pc-64/crystalforest" +COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" +KMACHINE_crystalforest-gladden = "crystalforest" +KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" -SRCREV_machine_pn-linux-yocto_crystalforest-stargo ?= "449f7f520350700858f21a5554b81cc8ad23267d" -SRCREV_meta_pn-linux-yocto_crystalforest-stargo ?= "2ec32d511b62d44b63e8560a9b1d6895a5dac695" +SRCREV_machine_pn-linux-yocto_crystalforest-gladden ?= "449f7f520350700858f21a5554b81cc8ad23267d" +SRCREV_meta_pn-linux-yocto_crystalforest-gladden ?= "2ec32d511b62d44b63e8560a9b1d6895a5dac695" -COMPATIBLE_MACHINE_crystalforest-shumway = "crystalforest-shumway" -KMACHINE_crystalforest-shumway = "crystalforest" -KBRANCH_crystalforest-shumway = "standard/common-pc-64/crystalforest" +COMPATIBLE_MACHINE_crystalforest-server = "crystalforest-server" +KMACHINE_crystalforest-server = "crystalforest" +KBRANCH_crystalforest-server = "standard/common-pc-64/crystalforest" -SRCREV_machine_pn-linux-yocto_crystalforest-shumway ?= "449f7f520350700858f21a5554b81cc8ad23267d" -SRCREV_meta_pn-linux-yocto_crystalforest-shumway ?= "2ec32d511b62d44b63e8560a9b1d6895a5dac695" +SRCREV_machine_pn-linux-yocto_crystalforest-server ?= "449f7f520350700858f21a5554b81cc8ad23267d" +SRCREV_meta_pn-linux-yocto_crystalforest-server ?= "2ec32d511b62d44b63e8560a9b1d6895a5dac695" module_autoload_uio = "uio" -- cgit v1.2.3-54-g00ecf