summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Chia Chuan <chia.chuan.wu@intel.com>2015-10-02 11:28:37 (GMT)
committerSaul Wold <sgw@linux.intel.com>2015-10-02 15:15:43 (GMT)
commite5fcf9e76dca11394a731a5512187a3261897111 (patch)
tree7007717d932f033ba77cabff13f747b497a33660
parent0d73402b4f350b8a11458c8b1e22ab927e0a015f (diff)
downloadmeta-intel-e5fcf9e76dca11394a731a5512187a3261897111.tar.gz
meta-crystalforest: relocate meta-crystalforest layer into meta-isg layer
This is in support of BSP consolidation of all Intel platforms in to meta-isg common layer. The "MAINTAINERS file" and "meta-isg/MAINTAINERS file" are updated to reflect the changed. Signed-off-by: Wu Chia Chuan <chia.chuan.wu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--MAINTAINERS4
-rw-r--r--meta-isg/MAINTAINERS4
-rw-r--r--meta-isg/meta-crystalforest/COPYING.MIT (renamed from meta-crystalforest/COPYING.MIT)0
-rw-r--r--meta-isg/meta-crystalforest/README (renamed from meta-crystalforest/README)8
-rw-r--r--meta-isg/meta-crystalforest/README.sources (renamed from meta-crystalforest/README.sources)0
-rw-r--r--meta-isg/meta-crystalforest/binary/.gitignore (renamed from meta-crystalforest/binary/.gitignore)0
-rw-r--r--meta-isg/meta-crystalforest/conf/layer.conf (renamed from meta-crystalforest/conf/layer.conf)0
-rw-r--r--meta-isg/meta-crystalforest/conf/machine/crystalforest.conf (renamed from meta-crystalforest/conf/machine/crystalforest.conf)0
-rw-r--r--meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig (renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig)0
-rw-r--r--meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig (renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig)0
-rw-r--r--meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend (renamed from meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend)0
11 files changed, 8 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 79a021d..443041d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -31,10 +31,6 @@ COMMON
31M: Saul Wold <sgw@linux.intel.com> 31M: Saul Wold <sgw@linux.intel.com>
32F: common/ 32F: common/
33 33
34CRYSTALFOREST
35M: Wu Chia Chuan <chia.chuan.wu@intel.com>
36F: meta-crystalforest/
37
38TLK 34TLK
39M: Saul Wold <sgw@linux.intel.com> 35M: Saul Wold <sgw@linux.intel.com>
40F: meta-tlk/ 36F: meta-tlk/
diff --git a/meta-isg/MAINTAINERS b/meta-isg/MAINTAINERS
index 98b8a5e..36cef64 100644
--- a/meta-isg/MAINTAINERS
+++ b/meta-isg/MAINTAINERS
@@ -49,3 +49,7 @@ F: meta-mohonpeak/
49VALLEYISLAND 49VALLEYISLAND
50M: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> 50M: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
51F: meta-valleyisland/ 51F: meta-valleyisland/
52
53CRYSTALFOREST
54M: Wu Chia Chuan <chia.chuan.wu@intel.com>
55F: meta-crystalforest/
diff --git a/meta-crystalforest/COPYING.MIT b/meta-isg/meta-crystalforest/COPYING.MIT
index fb950dc..fb950dc 100644
--- a/meta-crystalforest/COPYING.MIT
+++ b/meta-isg/meta-crystalforest/COPYING.MIT
diff --git a/meta-crystalforest/README b/meta-isg/meta-crystalforest/README
index f549f90..4878105 100644
--- a/meta-crystalforest/README
+++ b/meta-isg/meta-crystalforest/README
@@ -71,7 +71,7 @@ list (meta-intel@yoctoproject.org) and cc: the maintainer:
71 71
72Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com> 72Maintainer: Wu Chia Chuan <chia.chuan.wu@intel.com>
73 73
74Please see the meta-intel/MAINTAINERS file for more details. 74Please see the meta-isg/MAINTAINERS file for more details.
75 75
76 76
77Table of Contents 77Table of Contents
@@ -98,7 +98,7 @@ bblayers.conf, along with the meta-intel layer itself (to access
98common metadata shared between BSPs) e.g.: 98common metadata shared between BSPs) e.g.:
99 99
100 yocto/meta-intel \ 100 yocto/meta-intel \
101 yocto/meta-intel/meta-crystalforest \ 101 yocto/meta-intel/meta-isg/meta-crystalforest \
102 102
103Crystal Forest layer is meant for building both Crystal Forest Gladden 103Crystal Forest layer is meant for building both Crystal Forest Gladden
104and Crystal Forest Server platforms. By enabling Crystal Forest layer, 104and Crystal Forest Server platforms. By enabling Crystal Forest layer,
@@ -197,8 +197,8 @@ IV. Enabling Intel DPDK and QuickAssist Technology
197=================================================== 197===================================================
198 198
199DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk 199DPDK recipe: meta-intel/meta-isg/common/recipes-extended/dpdk
200QAT recipe: meta-crystalforest/recipes-extended/qat 200QAT recipe: meta-intel/meta-isg/common/recipes-extended/qat
201QAT-enable zlib recipe: meta-crystalforest/recipes-extended/zlib-qat 201QAT-enable zlib recipe: meta-intel/meta-isg/common/recipes-extended/zlib-qat
202 202
203Note: 203Note:
204qat16 recipe is meant for platform with Coleto Creek chipset. 204qat16 recipe is meant for platform with Coleto Creek chipset.
diff --git a/meta-crystalforest/README.sources b/meta-isg/meta-crystalforest/README.sources
index 0d4d849..0d4d849 100644
--- a/meta-crystalforest/README.sources
+++ b/meta-isg/meta-crystalforest/README.sources
diff --git a/meta-crystalforest/binary/.gitignore b/meta-isg/meta-crystalforest/binary/.gitignore
index e69de29..e69de29 100644
--- a/meta-crystalforest/binary/.gitignore
+++ b/meta-isg/meta-crystalforest/binary/.gitignore
diff --git a/meta-crystalforest/conf/layer.conf b/meta-isg/meta-crystalforest/conf/layer.conf
index daa2ba7..daa2ba7 100644
--- a/meta-crystalforest/conf/layer.conf
+++ b/meta-isg/meta-crystalforest/conf/layer.conf
diff --git a/meta-crystalforest/conf/machine/crystalforest.conf b/meta-isg/meta-crystalforest/conf/machine/crystalforest.conf
index 7716e56..7716e56 100644
--- a/meta-crystalforest/conf/machine/crystalforest.conf
+++ b/meta-isg/meta-crystalforest/conf/machine/crystalforest.conf
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
index ffce012..ffce012 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
index ffce012..ffce012 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-gladden/machconfig
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor/crystalforest-server/machconfig
diff --git a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 72d991c..72d991c 100644
--- a/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-isg/meta-crystalforest/recipes-bsp/formfactor/formfactor_0.0.bbappend