Change machine names
cover Change machine names
From: Kishore Bodke <[email protected]>
Hi,
These patch sets are for changing the machine names for the Crystal Forest which will be used to publish on the Yocto Project Website and adding the WEBTITLE for the Romley BSP.
Please pull them into meta-intel/master.
Thanks
Kishore.
The following changes since commit 0ebdf34f9a0f023f62305bddcbc8427d36f740b4:
fri2: Add tiny-init bbappend for devtmpfs and console (2012-10-26 20:24:53 -0700)
are available in the git repository at:
git://git.pokylinux.org/meta-intel-contrib Kishore/change_machine
http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=Kishore/change_machine
Kishore Bodke (2):
crystalforest: Change the machine names
romley: add WEBTITLE & Compliance information
meta-crystalforest/README | 26 +++++++++-----------
...rest-stargo.conf => crystalforest-gladden.conf} | 4 +--
...rest-shumway.conf => crystalforest-server.conf} | 4 +--
.../machconfig | 0
.../machconfig | 0
.../xorg.conf | 0
.../xorg.conf | 0
.../linux/linux-yocto-rt_3.4.bbappend | 21 ++++++++--------
.../recipes-kernel/linux/linux-yocto_3.4.bbappend | 20 +++++++--------
meta-romley/README | 11 +++++++--
meta-romley/conf/machine/romley.conf | 5 +++-
11 files changed, 49 insertions(+), 42 deletions(-)
rename meta-crystalforest/conf/machine/{crystalforest-stargo.conf => crystalforest-gladden.conf} (87%)
rename meta-crystalforest/conf/machine/{crystalforest-shumway.conf => crystalforest-server.conf} (94%)
rename meta-crystalforest/recipes-bsp/formfactor/formfactor/{crystalforest-shumway => crystalforest-gladden}/machconfig (100%)
rename meta-crystalforest/recipes-bsp/formfactor/formfactor/{crystalforest-stargo => crystalforest-server}/machconfig (100%)
rename meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/{crystalforest-shumway => crystalforest-gladden}/xorg.conf (100%)
rename meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/{crystalforest-stargo => crystalforest-server}/xorg.conf (100%)Signature · 1 line
1.7.9.5
PATCH 1/2 crystalforest: Change the machine names
From: Kishore Bodke <[email protected]>
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 <[email protected]>
---
meta-crystalforest/README | 26 +++++++++-----------
...rest-stargo.conf => crystalforest-gladden.conf} | 4 +--
...rest-shumway.conf => crystalforest-server.conf} | 4 +--
.../machconfig | 0
.../machconfig | 0
.../xorg.conf | 0
.../xorg.conf | 0
.../linux/linux-yocto-rt_3.4.bbappend | 21 ++++++++--------
.../recipes-kernel/linux/linux-yocto_3.4.bbappend | 20 +++++++--------
9 files changed, 36 insertions(+), 39 deletions(-)
rename meta-crystalforest/conf/machine/{crystalforest-stargo.conf => crystalforest-gladden.conf} (87%)
rename meta-crystalforest/conf/machine/{crystalforest-shumway.conf => crystalforest-server.conf} (94%)
rename meta-crystalforest/recipes-bsp/formfactor/formfactor/{crystalforest-shumway => crystalforest-gladden}/machconfig (100%)
rename meta-crystalforest/recipes-bsp/formfactor/formfactor/{crystalforest-stargo => crystalforest-server}/machconfig (100%)
rename meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/{crystalforest-shumway => crystalforest-gladden}/xorg.conf (100%)
rename meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/{crystalforest-stargo => crystalforest-server}/xorg.conf (100%)meta-crystalforest/README +12 -14
@@ -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 - -
meta-crystalforest/conf/machine/crystalforest-gladden.conf renamed from meta-crystalforest/conf/machine/crystalforest-stargo.conf +2 -2
@@ -1,7 +1,7 @@ #@TYPE: Machine -#@NAME: crystalforest-stargo +#@NAME: crystalforest-gladden -#@DESCRIPTION: Machine configuration for Crystal Forest (STARGO) systems +#@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"
meta-crystalforest/conf/machine/crystalforest-server.conf renamed from meta-crystalforest/conf/machine/crystalforest-shumway.conf +2 -2
@@ -1,7 +1,7 @@ #@TYPE: Machine -#@NAME: crystalforest-shumway +#@NAME: crystalforest-server -#@DESCRIPTION: Machine configuration for Crystal Forest Server (SHUMWAY) systems +#@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"
meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-shumway/machconfig +0 -0
meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-stargo/machconfig +0 -0
meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf renamed from meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-shumway/xorg.conf +0 -0
meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf renamed from meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-stargo/xorg.conf +0 -0
meta-crystalforest/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +10 -11
@@ -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"
meta-crystalforest/recipes-kernel/linux/linux-yocto_3.4.bbappend +10 -10
@@ -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"
Signature · 1 line
1.7.9.5
PATCH 2/2 romley: add WEBTITLE & Compliance information
From: Kishore Bodke <[email protected]>
The WEBTITLE will be used to publish the BSP on the Yocto Project Website. And adding the Yocto Project Compliance information for the 1.3 release.
Signed-off-by Kishore Bodke <[email protected]>
--- meta-romley/README | 11 +++++++++-- meta-romley/conf/machine/romley.conf | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-)
meta-romley/README +9 -2
@@ -2,9 +2,16 @@ This README file contains information on building the meta-romley BSP layer, and booting the images contained in the /binary directory. Please see the corresponding sections below for details. -The 'romley' platform consists of the Intel Sandy Bridge processor, -plus the Patsburg chipset. This BSP assumes Matrox graphics is being used. +The 'romley' platform consists of the Intel Xeon E5-2600 and E5-2400 +Series Processors, plus the Intel C604/C602-J Chipset. +This BSP assumes Matrox graphics is being used. +Compliance +========== +This BSP is compliant with the Yocto Project as per the requirements +listed here: + + http://www.yoctoproject.org/yocto-project-compatible-registration Dependencies ============
meta-romley/conf/machine/romley.conf +4 -1
@@ -1,8 +1,11 @@ #@TYPE: Machine #@NAME: romley +#@WEBTITLE: Intel Xeon E5-2600 and E5-2400 Series (Formerly Sandy Bridge-EP/EN) +#Processors with Intel C604/C602-J Chipset (Romley-EP/EN Platform) + #@DESCRIPTION: Machine configuration for Romley systems -# i.e. Sandy Bridge + Patsburg Chipset +# i.e. Xeon E5-2600 and E5-2400 + Intel CC604/C602-J PREFERRED_VERSION_linux-yocto ?= "3.2%"
Signature · 1 line
1.7.9.5
Quoted 11 lines · On Mon, 2012-10-29 at 10:42 -0700, [email protected] wrote:
From: Kishore Bodke <[email protected]>
Hi,
These patch sets are for changing the machine names for the Crystal Forest which will be used to publish on the Yocto Project Website and adding the WEBTITLE for the Romley BSP.
Please pull them into meta-intel/master.
Pulled into meta-intel/master.
Thanks,
Tom
Quoted 35 lines
Thanks
Kishore.The following changes since commit
0ebdf34f9a0f023f62305bddcbc8427d36f740b4:fri2: Add tiny-init bbappend for devtmpfs and console (2012-10-26 20:24:53 -0700)
are available in the git repository at:
git://git.pokylinux.org/meta-intel-contribKishore/change_machine
http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=Kishore/change_machineKishore Bodke (2):
crystalforest: Change the machine names
romley: add WEBTITLE & Compliance informationmeta-crystalforest/README | 26 +++++++++----------- ...rest-stargo.conf => crystalforest-gladden.conf} | 4 +-- ...rest-shumway.conf => crystalforest-server.conf} | 4 +-- .../machconfig | 0 .../machconfig | 0 .../xorg.conf | 0 .../xorg.conf | 0 .../linux/linux-yocto-rt_3.4.bbappend | 21 ++++++++-------- .../recipes-kernel/linux/linux-yocto_3.4.bbappend | 20 +++++++-------- meta-romley/README | 11 +++++++-- meta-romley/conf/machine/romley.conf | 5 +++- 11 files changed, 49 insertions(+), 42 deletions(-) rename meta-crystalforest/conf/machine/{crystalforest-stargo.conf => crystalforest-gladden.conf} (87%) rename meta-crystalforest/conf/machine/{crystalforest-shumway.conf => crystalforest-server.conf} (94%) rename meta-crystalforest/recipes-bsp/formfactor/formfactor/{crystalforest-shumway => crystalforest-gladden}/machconfig (100%) rename meta-crystalforest/recipes-bsp/formfactor/formfactor/{crystalforest-stargo => crystalforest-server}/machconfig (100%) rename meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/{crystalforest-shumway => crystalforest-gladden}/xorg.conf (100%) rename meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/{crystalforest-stargo => crystalforest-server}/xorg.conf (100%)